diff --git a/seed/static/seed/js/controllers/insights_property_controller.js b/seed/static/seed/js/controllers/insights_property_controller.js index b974844fe5..c01753461b 100644 --- a/seed/static/seed/js/controllers/insights_property_controller.js +++ b/seed/static/seed/js/controllers/insights_property_controller.js @@ -20,6 +20,12 @@ angular.module('BE.seed.controller.insights_property', []).controller('insights_ $scope.organization = organization_payload.organization; $scope.auth = auth_payload.auth; + // toggle help + $scope.show_help = false; + $scope.toggle_help = () => { + $scope.show_help = !$scope.show_help; + } + // configs ($scope.configs set to saved_configs where still applies. // for example, if saved_configs.compliance_metric is 1, but 1 has been deleted, it does apply.) const saved_configs = JSON.parse(localStorage.getItem(`insights.property.configs.${$scope.organization.id}`)); @@ -468,7 +474,7 @@ angular.module('BE.seed.controller.insights_property', []).controller('insights_ }); // update x axis ticks (for year) - if (x_axis_name.toLowerCase().includes('year')) { + if (x_axis_name && x_axis_name.toLowerCase().includes('year')) { $scope.insightsChart.options.scales.x.ticks = { callback(value) { return this.getLabelForValue(value).replace(',', ''); diff --git a/seed/static/seed/locales/en_US.json b/seed/static/seed/locales/en_US.json index 82a30236b3..478c54ecda 100644 --- a/seed/static/seed/locales/en_US.json +++ b/seed/static/seed/locales/en_US.json @@ -115,6 +115,7 @@ "Building Filters": "Building Filters", "Buildings": "Buildings", "By clicking the Log In button you accept the NREL Data Terms.": "By clicking the Log In button you accept the NREL Data Terms.", + "CLICK_LEGEND": "Click a label below to show/hide it on the chart", "COLUMN_NAME_DUPLICATE_ERROR": "Error: New column name cannot match previous name.", "COLUMN_NAME_EXISTS_WARNING": "Warning: Column name already exists.", "COL_CHANGE_DESCRIPTION": "Provides a description of the column to assist in remembering the meaning of the column. This defaults to the display name if available, otherwise the column name is utilized.", @@ -134,6 +135,7 @@ "COL_MATCHING_CRITERIA_TOGGLE": "Checking this box for a field will allow it to be used as a matching field.", "COL_MERGE_PROTECTION_TOGGLE": "Normally when an imported record is merged into another record the newest value overwrites an older one. Merge protection prevents this, and is particularly useful for columns where you have manually edited values that you want to persist even after importing and merging new data.", "COMPLETE_AND_REFRESH": "Complete and Refresh Page", + "CONFIGURE_PROGRAM":"Need to configure your Program?", "CONFIRMING_DELETE_PROFILE": "Are you sure you want to delete the profile", "CONFIRM_AND_START_MATCHING": "Confirm mappings & start matching", "CONTINUE": "Continue", @@ -152,6 +154,7 @@ "Change my password": "Change my password", "Changed By": "Changed By", "Chart Legend": "Chart Legend", + "Chart Options": "Chart Options", "Choose Existing Organization:": "Choose Existing Organization:", "Choose the year ending month for report period.": "Choose the year ending month for report period.", "City": "City", @@ -467,6 +470,7 @@ "INCLUDE_SHARED_TAXLOTS": "Include in your Tax Lot List all tax lots shared with you.", "INDIVIDUAL_MATCH_MERGE_ROUND_ALERT": "This action will kick off a match and merge round for the resulting record. This record's values will be given precedence in the event that any merges occur. Multiple matching records are merged beforehand with precedence given to more recently imported records.", "INTERNAL": "INTERNAL", + "INSIGHTS_HELP_TEXT": "Use the controls below to display a subset of properties on the graph. The chart legend can also be used to display or hide properties based on compliance status. The 'Update Property Labels' button can then be used to edit the labels applied to the properties visible on the graph.", "INVALID_CSV_EXTENSION_ALERT": "Sorry!<\/strong> SEED doesn't currently support that file format. Only .csv<\/strong> files are supported.", "INVALID_DOC_FILE_EXTENSION_ALERT": "Invalid document type selected. Accepted file types are .dxf, .pdf, .idf, and .osm", "INVALID_EXTENSION_ALERT": "Sorry!<\/strong> SEED doesn't currently support that file format. Only .csv<\/strong>, .xls<\/strong>, .xlsx<\/strong>, and .xml<\/strong> files are supported.", @@ -747,6 +751,7 @@ "Profile Information": "Profile Information", "Profile Name": "Profile Name", "Program": "Program", + "Program Configuration page": "Program Configuration page", "Program Definition": "Program Definition", "Program Metric": "Program Metric", "Program Metric Configuration": "Program Metric Configuration", @@ -1098,6 +1103,7 @@ "Until last date of": "Until last date of", "Update Charts": "Update Charts", "Update Filters": "Update Filters", + "Update Property Labels": "Update Property Labels", "Update Salesforce": "Update Salesforce", "Update UBID": "Update UBID", "Update with Audit Template": "Update with Audit Template", diff --git a/seed/static/seed/locales/fr_CA.json b/seed/static/seed/locales/fr_CA.json index 6ba56bcca2..dfbfedd277 100644 --- a/seed/static/seed/locales/fr_CA.json +++ b/seed/static/seed/locales/fr_CA.json @@ -115,6 +115,7 @@ "Building Filters": "Filtres de bâtiments", "Buildings": "Bâtiments", "By clicking the Log In button you accept the NREL Data Terms.": "En cliquant sur le bouton Connexion, vous acceptez les conditions d'utilisation des données NREL.", + "CLICK_LEGEND": "Cliquez sur une étiquette ci-dessous pour l'afficher/masquer sur le graphique", "COLUMN_NAME_DUPLICATE_ERROR": "Erreur: Le nom de la nouvelle colonne ne peut pas correspondre au nom précédent.", "COLUMN_NAME_EXISTS_WARNING": "Attention: le nom de la colonne existe déjà.", "COL_CHANGE_DESCRIPTION": "Fournit une description de la colonne pour aider à se souvenir de la signification de la colonne. Il s'agit par défaut du nom d'affichage s'il est disponible, sinon le nom de la colonne est utilisé.", @@ -134,6 +135,7 @@ "COL_MATCHING_CRITERIA_TOGGLE": "Pour les colonnes non extra_data, indiquez si la colonne correspond aux critères", "COL_MERGE_PROTECTION_TOGGLE": "Normalement, lorsqu'un enregistrement importé est fusionné dans un autre enregistrement, la valeur la plus récente remplace un enregistrement plus ancien. La protection de fusion empêche cela et est particulièrement utile pour les colonnes dans lesquelles vous avez manuellement modifié les valeurs que vous souhaitez conserver même après l'importation et la fusion de nouvelles données.", "COMPLETE_AND_REFRESH": "Complétez et Actualisez la Page", + "CONFIGURE_PROGRAM":"Besoin de configurer votre programme?", "CONFIRMING_DELETE_PROFILE": "Êtes-vous sûr de vouloir supprimer le profil", "CONFIRM_AND_START_MATCHING": "Confirmer et commencer l'appariement", "CONTINUE": "Continuer", @@ -151,7 +153,8 @@ "Change Your Password": "Changez votre mot de passe", "Change my password": "Changer mon mot de passe", "Changed By": "Changé par", - "Chart Legend": "Légende du graphique", + "Chart Legend": "Légende du Graphique", + "Chart Options": "Options du Graphique", "Choose Existing Organization:": "Choisissez Organisation Existante:", "Choose the year ending month for report period.": "Choisissez le mois de fin de l'année pour la période du rapport.", "City": "Ville", @@ -466,6 +469,7 @@ "INCLUDE_SHARED_PROPERTIES": "Inclure dans vos Liste de Propriétés toutes les propriétés partagées avec vous.", "INCLUDE_SHARED_TAXLOTS": "Inclure dans votre Liste de Lots d'Impôt tous les lots d'impôt partagé avec vous.", "INDIVIDUAL_MATCH_MERGE_ROUND_ALERT": "Cette action lancera un match et fusionnera pour l’enregistrement résultant. Les valeurs de cet enregistrement auront la priorité dans l'éventualité d'une fusion. Plusieurs enregistrements correspondants sont préalablement fusionnés, la priorité étant donnée aux enregistrements récemment importés.", + "INSIGHTS_HELP_TEXT": "Utilisez les commandes ci-dessous pour afficher un sous-ensemble de propriétés sur le graphique. La légende du graphique peut également être utilisée pour afficher ou masquer des propriétés en fonction de l'état de conformité. Le bouton 'Mettre à jour les étiquettes des propriétés' peut ensuite être utilisé pour modifier les étiquettes appliquées aux propriétés visibles sur le graphique.", "INTERNAL": "INTERNE", "INVALID_CSV_EXTENSION_ALERT": "Désolé!<\/strong> SEED ne prend actuellement pas en charge ce format de fichier. Seuls les fichiers .csv<\/strong> sont pris en charge.", "INVALID_DOC_FILE_EXTENSION_ALERT": "Type de document sélectionné non valide. Les types de fichiers acceptés sont .dxf, .pdf, .idf et .osm", @@ -747,6 +751,7 @@ "Profile Information": "Informations sur le profil", "Profile Name": "Nom de profil", "Program": "Programme", + "Program Configuration page": "Page de configuration du programme", "Program Definition": "Définition du programme", "Program Metric": "Métrique du programme", "Program Metric Configuration": "Configuration de la métrique du programme", @@ -1098,6 +1103,7 @@ "Until last date of": "Jusqu'à la dernière date de", "Update Charts": "Mettre à jour les graphiques", "Update Filters": "Mise à jour les filtres", + "Update Property Labels": "Mettre à jour les étiquettes de propriété", "Update Salesforce": "Mettre à jour Salesforce", "Update UBID": "Mettre à jour UBID", "Update with Audit Template": "Mise à jour avec Audit Template", diff --git a/seed/static/seed/partials/insights_property.html b/seed/static/seed/partials/insights_property.html index 76f5d66cac..9e45cd744c 100644 --- a/seed/static/seed/partials/insights_property.html +++ b/seed/static/seed/partials/insights_property.html @@ -12,82 +12,59 @@
-
-
-
-
-

{$:: 'Property Insights' | translate $}

-
+
+

If you are not seeing a chart on this page, visit the Program page to configure your program's metrics.

-
-
-
-
-

{$:: 'Property Insights' | translate $}

-
+
-

Need to configure your Program? Program Configuration page.

+

CONFIGURE_PROGRAM Program Configuration page.

-
-
Chart Legend
-

Click a series to show/hide on the chart

-
-
blue circle marker
-
Compliant
-
Compliant
-
-
-
red triangle marker
-
Not Compliant
-
Not Compliant
+
+
+
+
+
+
+
Chart Options
+
+

INSIGHTS_HELP_TEXT

+
-
-
gray square marker
-
Unknown
-
Unknown
+ +
+ +
-
-
distance to target marker
-
Distance to Target
-
Distance to Target
+ +
+ +
-
-
- - -
- -
- - -
- -
- - -
-
- - -
+ +
+ + +
+
+ + +
-
-
- +
+
-
-
-
+
+
-
-
+
+
@@ -164,6 +141,38 @@

{$:: 'Property Insights' | translate $}

+
+
+
+ +
+
+
+
Chart Legend
+

CLICK_LEGEND

+
+
blue circle marker
+
Compliant
+
Compliant
+
+
+
+ red triangle marker
+
Not Compliant
+
Not Compliant
+
+
+
gray square marker
+
Unknown
+
Unknown
+
+
+
distance to target marker
+
Distance to Target
+
Distance to Target
+
+
+
diff --git a/seed/static/seed/scss/style.scss b/seed/static/seed/scss/style.scss index f0ed4aa475..473431333b 100755 --- a/seed/static/seed/scss/style.scss +++ b/seed/static/seed/scss/style.scss @@ -4302,11 +4302,12 @@ iframe.analysis-results { // program overview / compliance-setup .compliance-setup { - background-color: #eee; - padding: 1.5em; + /*background-color: #eee;*/ + padding: 0.5em; p { margin: 0; + font-size: 1.25em !important; } } @@ -4330,12 +4331,22 @@ iframe.analysis-results { margin-right: 10px; } +.chart-buttons { + margin-top: 10px; + margin-right: 5px; + text-align: right; +} + .chart-legend { margin-top: 15px; margin-left: 0; + margin-right: 15px; + padding: 15px; + border: 1px solid #ddd; .title { font-size: 1.4em; + font-weight: bold; } .legend-icon { @@ -4384,6 +4395,30 @@ iframe.analysis-results { } } +.chart-options { + margin-top: 25px; + padding-top: 10px; + margin-left: 0; + + .title { + font-size: 1.4em; + font-weight: bold; + } + + .form-group { + margin-bottom: 5px; + } + + .small-text { + font-size: 1em !important; + } +} + +.help-text-icon { + margin: 0px 5px; + color: #337ab7; +} + .title-row { padding: 0 0 10px; @@ -4597,7 +4632,15 @@ ul.r-list { } .less_pad { - padding-left: 30px !important; + padding: 0px 10px 10px 10px !important; +} + +.insights-header { + padding: 10px 10px 0px 10px !important; +} + +.insights-table { + margin-top: 0px !important; } .rp-data-view {