@@ 605-635 (lines=31) @@ | ||
602 | result['reporting_period']['deeps'] = list() |
|
603 | result['reporting_period']['increment_rates'] = list() |
|
604 | ||
605 | if energy_item_set is not None and len(energy_item_set) > 0: |
|
606 | for energy_item_id in energy_item_set: |
|
607 | result['reporting_period']['names'].append(energy_item_dict[energy_item_id]['name']) |
|
608 | result['reporting_period']['energy_item_ids'].append(energy_item_id) |
|
609 | result['reporting_period']['energy_category_names'].append( |
|
610 | energy_item_dict[energy_item_id]['energy_category_name']) |
|
611 | result['reporting_period']['energy_category_ids'].append( |
|
612 | energy_item_dict[energy_item_id]['energy_category_id']) |
|
613 | result['reporting_period']['units'].append(energy_item_dict[energy_item_id]['unit_of_measure']) |
|
614 | result['reporting_period']['timestamps'].append(reporting[energy_item_id]['timestamps']) |
|
615 | result['reporting_period']['values'].append(reporting[energy_item_id]['values']) |
|
616 | result['reporting_period']['subtotals'].append(reporting[energy_item_id]['subtotal']) |
|
617 | result['reporting_period']['toppeaks'].append(reporting[energy_item_id]['toppeak']) |
|
618 | result['reporting_period']['onpeaks'].append(reporting[energy_item_id]['onpeak']) |
|
619 | result['reporting_period']['midpeaks'].append(reporting[energy_item_id]['midpeak']) |
|
620 | result['reporting_period']['offpeaks'].append(reporting[energy_item_id]['offpeak']) |
|
621 | result['reporting_period']['deeps'].append(reporting[energy_item_id]['deep']) |
|
622 | result['reporting_period']['increment_rates'].append( |
|
623 | (reporting[energy_item_id]['subtotal'] - base[energy_item_id]['subtotal']) / |
|
624 | base[energy_item_id]['subtotal'] |
|
625 | if base[energy_item_id]['subtotal'] > Decimal(0.0) else None) |
|
626 | ||
627 | rate = list() |
|
628 | for index, value in enumerate(reporting[energy_item_id]['values']): |
|
629 | if index < len(base[energy_item_id]['values']) \ |
|
630 | and base[energy_item_id]['values'][index] != 0 and value != 0: |
|
631 | rate.append((value - base[energy_item_id]['values'][index]) |
|
632 | / base[energy_item_id]['values'][index]) |
|
633 | else: |
|
634 | rate.append(None) |
|
635 | result['reporting_period']['rates'].append(rate) |
|
636 | ||
637 | result['parameters'] = { |
|
638 | "names": parameters_data['names'], |
@@ 557-587 (lines=31) @@ | ||
554 | result['reporting_period']['deeps'] = list() |
|
555 | result['reporting_period']['increment_rates'] = list() |
|
556 | ||
557 | if energy_item_set is not None and len(energy_item_set) > 0: |
|
558 | for energy_item_id in energy_item_set: |
|
559 | result['reporting_period']['names'].append(energy_item_dict[energy_item_id]['name']) |
|
560 | result['reporting_period']['energy_item_ids'].append(energy_item_id) |
|
561 | result['reporting_period']['energy_category_names'].append( |
|
562 | energy_item_dict[energy_item_id]['energy_category_name']) |
|
563 | result['reporting_period']['energy_category_ids'].append( |
|
564 | energy_item_dict[energy_item_id]['energy_category_id']) |
|
565 | result['reporting_period']['units'].append(energy_item_dict[energy_item_id]['unit_of_measure']) |
|
566 | result['reporting_period']['timestamps'].append(reporting[energy_item_id]['timestamps']) |
|
567 | result['reporting_period']['values'].append(reporting[energy_item_id]['values']) |
|
568 | result['reporting_period']['subtotals'].append(reporting[energy_item_id]['subtotal']) |
|
569 | result['reporting_period']['toppeaks'].append(reporting[energy_item_id]['toppeak']) |
|
570 | result['reporting_period']['onpeaks'].append(reporting[energy_item_id]['onpeak']) |
|
571 | result['reporting_period']['midpeaks'].append(reporting[energy_item_id]['midpeak']) |
|
572 | result['reporting_period']['offpeaks'].append(reporting[energy_item_id]['offpeak']) |
|
573 | result['reporting_period']['deeps'].append(reporting[energy_item_id]['deep']) |
|
574 | result['reporting_period']['increment_rates'].append( |
|
575 | (reporting[energy_item_id]['subtotal'] - base[energy_item_id]['subtotal']) / |
|
576 | base[energy_item_id]['subtotal'] |
|
577 | if base[energy_item_id]['subtotal'] > 0.0 else None) |
|
578 | ||
579 | rate = list() |
|
580 | for index, value in enumerate(reporting[energy_item_id]['values']): |
|
581 | if index < len(base[energy_item_id]['values']) \ |
|
582 | and base[energy_item_id]['values'][index] != 0 and value != 0: |
|
583 | rate.append((value - base[energy_item_id]['values'][index]) |
|
584 | / base[energy_item_id]['values'][index]) |
|
585 | else: |
|
586 | rate.append(None) |
|
587 | result['reporting_period']['rates'].append(rate) |
|
588 | ||
589 | result['parameters'] = { |
|
590 | "names": parameters_data['names'], |