-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fixes/Avg-to-Consuption
- Loading branch information
Showing
24 changed files
with
378 additions
and
362 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "id": "{0F74D76C-701E-8343-C563-091FBA9E7EBC}", | ||
| "name": "PDFReportEnergy", | ||
| "type": 3, | ||
| "vendor": "", | ||
| "aliases": [ | ||
| "Report (PDF, Energy)" | ||
| ], | ||
| "parentRequirements": [], | ||
| "childRequirements": [], | ||
| "implemented": [], | ||
| "prefix": "RAC", | ||
| "url": "https://www.symcon.de/en/service/documentation/module-reference/symconreport/pdfreport-energy/" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,102 @@ | ||
| { | ||
| "elements": [ | ||
| { | ||
| "type": "Label", | ||
| "label": "Select a PNG file as your PDF logo" | ||
| }, | ||
| { | ||
| "name": "LogoData", | ||
| "type": "SelectFile", | ||
| "caption": "Logo", | ||
| "extensions": ".png" | ||
| }, | ||
| { | ||
| "type": "ValidationTextBox", | ||
| "name": "CompanyName", | ||
| "caption": "Company" | ||
| }, | ||
| { | ||
| "type": "ValidationTextBox", | ||
| "name": "ReportTitle", | ||
| "caption": "Title" | ||
| }, | ||
| { | ||
| "type": "ValidationTextBox", | ||
| "name": "ReportFooter", | ||
| "caption": "Footer" | ||
| }, | ||
| { | ||
| "type": "List", | ||
| "name": "DataVariables", | ||
| "caption": "Data Sources", | ||
| "add": true, | ||
| "delete": true, | ||
| "rowCount": 5, | ||
| "columns": [ | ||
| "elements": [ | ||
| { | ||
| "caption": "VariableID", | ||
| "name": "VariableID", | ||
| "width": "150px", | ||
| "add": 0, | ||
| "edit": { | ||
| "type": "SelectVariable", | ||
| "requiredLogging": 1 | ||
| } | ||
| }, { | ||
| "caption": "Column Name", | ||
| "name": "Name", | ||
| "width": "auto", | ||
| "add": "", | ||
| "edit": { | ||
| "type": "ValidationTextBox" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "DataAggregation", | ||
| "type": "Select", | ||
| "caption": "Data Aggregation", | ||
| "options": [ | ||
| "type": "Label", | ||
| "label": "Select a PNG file as your PDF logo" | ||
| }, | ||
| { | ||
| "name": "LogoData", | ||
| "type": "SelectFile", | ||
| "caption": "Logo", | ||
| "extensions": ".png" | ||
| }, | ||
| { | ||
| "type": "ValidationTextBox", | ||
| "name": "CompanyName", | ||
| "caption": "Company" | ||
| }, | ||
| { | ||
| "type": "ValidationTextBox", | ||
| "name": "ReportTitle", | ||
| "caption": "Title" | ||
| }, | ||
| { | ||
| "label": "Hour", | ||
| "value": 0 | ||
| "type": "ValidationTextBox", | ||
| "name": "ReportFooter", | ||
| "caption": "Footer" | ||
| }, | ||
| { | ||
| "label": "Day", | ||
| "value": 1 | ||
| "type": "List", | ||
| "name": "DataVariables", | ||
| "caption": "Data Sources", | ||
| "add": true, | ||
| "delete": true, | ||
| "rowCount": 5, | ||
| "columns": [ | ||
| { | ||
| "caption": "VariableID", | ||
| "name": "VariableID", | ||
| "width": "150px", | ||
| "add": 0, | ||
| "edit": { | ||
| "type": "SelectVariable", | ||
| "requiredLogging": 1 | ||
| } | ||
| }, | ||
| { | ||
| "caption": "Column Name", | ||
| "name": "Name", | ||
| "width": "auto", | ||
| "add": "", | ||
| "edit": { | ||
| "type": "ValidationTextBox" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "label": "Week", | ||
| "value": 2 | ||
| "name": "DataAggregation", | ||
| "type": "Select", | ||
| "caption": "Data Aggregation", | ||
| "options": [ | ||
| { | ||
| "label": "Hour", | ||
| "value": 0 | ||
| }, | ||
| { | ||
| "label": "Day", | ||
| "value": 1 | ||
| }, | ||
| { | ||
| "label": "Week", | ||
| "value": 2 | ||
| }, | ||
| { | ||
| "label": "Month", | ||
| "value": 3 | ||
| }, | ||
| { | ||
| "label": "Year", | ||
| "value": 4 | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "label": "Month", | ||
| "value": 3 | ||
| "type": "NumberSpinner", | ||
| "name": "DataCount", | ||
| "caption": "Data Count" | ||
| }, | ||
| { | ||
| "label": "Year", | ||
| "value": 4 | ||
| "type": "CheckBox", | ||
| "name": "DataSkipFirst", | ||
| "caption": "Skip current unfinished dataset" | ||
| } | ||
| ], | ||
| "actions": [ | ||
| { | ||
| "type": "Button", | ||
| "label": "Generate report now!", | ||
| "onClick": "if(RAC_GenerateReport($id)) { \n echo (new IPSModule($id))->Translate('Done! Please open the media file beneath this instance!'); \n };" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "NumberSpinner", | ||
| "name": "DataCount", | ||
| "caption": "Data Count" | ||
| }, | ||
| { | ||
| "type": "CheckBox", | ||
| "name": "DataSkipFirst", | ||
| "caption": "Skip current unfinished dataset" | ||
| } | ||
| ], | ||
| "actions": [ | ||
| { | ||
| "type": "Button", | ||
| "label": "Generate report now!", | ||
| "onClick": "if(RAC_GenerateReport($id)) { \n echo (new IPSModule($id))->Translate('Done! Please open the media file beneath this instance!'); \n };" | ||
| } | ||
| ] | ||
| ] | ||
| } |
Oops, something went wrong.