more impact criterias

install/Install.php

@@ -105,11 +105,18 @@ public function install(array $args = []): bool
         global $DB;
 
         $dbFile = plugin_carbon_getSchemaPath();
-        if ($dbFile === null || !$DB->runFile($dbFile)) {
+        if ($dbFile === null) {
             $this->migration->addWarningMessage("Error creating tables : " . $DB->error());
             return false;
         }
 
+        try {
+            $DB->runFile($dbFile);
+        } catch (\RuntimeException $e) {
+            $this->migration->addWarningMessage("Error creating tables : " . $e->getMessage());
+            return false;
+        }
+
         // Execute all install sub tasks
         $install_dir = __DIR__ . '/install/';
         $update_scripts = scandir($install_dir);

install/data/carbon_intensity/carbon-intensity-electricity.txt

@@ -0,0 +1,2 @@
+Data source:
+https://ourworldindata.org/grapher/carbon-intensity-electricity

install/data/report_dashboard.json

@@ -77,27 +77,27 @@
             "point_labels": "0"
         }
     },
-    "plugin_carbon_report_embodied_abiotic_depletion": {
+    "plugin_carbon_report_embodied_adp_impact": {
         "x": 5,
         "y": 3,
         "width": 5,
         "height": 3,
         "card_options": {
             "color": "#ffd966",
-            "widgettype": "embodied_abiotic_depletion",
+            "widgettype": "impact_criteria_number",
             "use_gradient": "0",
             "point_labels": "0",
             "limit": "7"
         }
     },
-    "plugin_carbon_report_embodied_global_warming": {
+    "plugin_carbon_report_embodied_gwp_impact": {
         "x": 10,
         "y": 0,
         "width": 5,
         "height": 3,
         "card_options": {
             "color": "#7a941e",
-            "widgettype": "embodied_global_warming",
+            "widgettype": "impact_criteria_number",
             "use_gradient": "0",
             "point_labels": "0",
             "limit": "7"
@@ -110,7 +110,7 @@
         "height": 3,
         "card_options": {
             "color": "#326319",
-            "widgettype": "embodied_primary_energy",
+            "widgettype": "impact_criteria_number",
             "use_gradient": "0",
             "point_labels": "0",
             "limit": "7"

install/install/init_datasources.php

@@ -104,18 +104,18 @@
     Install::linkSourceZone($source_id, $zone_id, $code);
 
     // Insert into the database
-    $success = $DB->updateOrInsert($table, [
-        'intensity' => $intensity,
-        'data_quality' => 2 // constant GlpiPlugin\Carbon\DataTracking::DATA_QUALITY_ESTIMATED
-    ], [
-        'date' => "$year-01-01 00:00:00",
-        'plugin_carbon_sources_id' => $source_id,
-        'plugin_carbon_zones_id'   => $zone_id,
-    ]);
-
-    if ($success === false) {
+    try {
+        $DB->updateOrInsert($table, [
+            'intensity' => $intensity,
+            'data_quality' => 2 // constant GlpiPlugin\Carbon\DataTracking::DATA_QUALITY_ESTIMATED
+        ], [
+            'date' => "$year-01-01 00:00:00",
+            'plugin_carbon_sources_id' => $source_id,
+            'plugin_carbon_zones_id'   => $zone_id,
+        ]);
+    } catch (\RuntimeException $e) {
         $file = null; // close the file
-        throw new \RuntimeException("Failed to insert data for year $year");
+        throw new \RuntimeException("Failed to insert data for year $year; reason: " . $e->getMessage(), $e->getCode(), $e);
     }
 }
 if ($progress_bar) {
@@ -129,17 +129,17 @@
 
 $quebec_carbon_intensity = include(dirname(__DIR__) . '/data/carbon_intensity/quebec.php');
 foreach ($quebec_carbon_intensity as $year => $intensity) {
-    $success = $DB->updateOrInsert($table, [
-        'intensity' => $intensity,
-        'data_quality' => 2 // constant GlpiPlugin\Carbon\DataTracking::DATA_QUALITY_ESTIMATED
-    ], [
-        'date' => "$year-01-01 00:00:00",
-        'plugin_carbon_sources_id' => $source_id,
-        'plugin_carbon_zones_id' => $zone_id_quebec,
-    ]);
-
-    if ($success === false) {
+    try {
+        $DB->updateOrInsert($table, [
+            'intensity' => $intensity,
+            'data_quality' => 2 // constant GlpiPlugin\Carbon\DataTracking::DATA_QUALITY_ESTIMATED
+        ], [
+            'date' => "$year-01-01 00:00:00",
+            'plugin_carbon_sources_id' => $source_id,
+            'plugin_carbon_zones_id' => $zone_id_quebec,
+        ]);
+    } catch (\RuntimeException $e) {
         $file = null; // close the file
-        throw new \RuntimeException("Failed to insert data for year $year");
+        throw new \RuntimeException("Failed to insert data for year $year; reason: " . $e->getMessage(), $e->getCode(), $e);
     }
 }

install/migration/update_1.0.0_to_1.0.1.php

@@ -57,10 +57,16 @@ function update100to101(Migration $migration)
     }
 
     $dbFile = plugin_carbon_getSchemaPath($to_version);
-    if ($dbFile === null || !$DB->runFile($dbFile)) {
+    if ($dbFile === null) {
         $migration->addWarningMessage("Error creating tables : " . $DB->error());
         $updateresult = false;
     }
+    try {
+        $DB->runFile($dbFile);
+    } catch (\RuntimeException $e) {
+        $migration->addWarningMessage("Error creating tables : " . $e->getMessage());
+        $updateresult = false;
+    }
 
     // ************ Keep it at the end **************
     $migration->executeMigration();

install/migration/update_1.0.1_to_1.1.0.php

@@ -57,10 +57,17 @@ function update101to110(Migration $migration)
     }
 
     $dbFile = plugin_carbon_getSchemaPath($to_version);
-    if ($dbFile === null || !$DB->runFile($dbFile)) {
+    if ($dbFile === null) {
         $migration->addWarningMessage("Error creating tables : " . $DB->error());
         $updateresult = false;
     }
+    try {
+        $DB->runFile($dbFile);
+    } catch (\RuntimeException $e) {
+        $migration->addWarningMessage("Error creating tables : " . $e->getMessage());
+        $updateresult = false;
+    }
+
 
     // ************ Keep it at the end **************
     $migration->executeMigration();

install/migration/update_1.1.1_to_1.2.0.php

@@ -57,10 +57,17 @@ function update111to120(Migration $migration)
     }
 
     $dbFile = plugin_carbon_getSchemaPath($to_version);
-    if ($dbFile === null || !$DB->runFile($dbFile)) {
+    if ($dbFile === null) {
         $migration->addWarningMessage("Error creating tables : " . $DB->error());
         $updateresult = false;
     }
+    try {
+        $DB->runFile($dbFile);
+    } catch (\RuntimeException $e) {
+        $migration->addWarningMessage("Error creating tables : " . $e->getMessage());
+        $updateresult = false;
+    }
+
 
     // ************ Keep it at the end **************
     $migration->executeMigration();