mise en place prise en compte quota par deaut depuis admin plugin pou…

…r surcarge sur un contrat fixes #14
Probesys · May 9, 2023 · 5ed622e · 5ed622e
1 parent 94c6bb2
commit 5ed622e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/inc/contract.class.php b/inc/contract.class.php
@@ -1113,7 +1113,8 @@ public static function getContractsOverQuota()
                     if ($consumption) {
                         // récupération d'un quota spécique sur le contrat
                         $contractQuotaAlertObject = PluginProjectbridgeContractQuotaAlert::getContractQuotaAlertByContractID($row['id']);
-                        if ($contractQuotaAlertObject && intval($contractQuotaAlertObject['quotaAlert']) > 0) {
+                        //if ($contractQuotaAlertObject && intval($contractQuotaAlertObject['quotaAlert']) > 0) {
+                        if ($contractQuotaAlertObject) {    
                             $quota = intval($contractQuotaAlertObject['quotaAlert']);
                         }
                         // calul ration conso
@@ -1199,7 +1200,8 @@ public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $
     public function showConfigFormForContract(Contract $entity, $selectedValue = 0)
     {
         $contractId = $entity->getField('id');
-
+        // instancite selectedValue with default quota alert
+        $selectedValue = PluginProjectbridgeConfig::getConfValueByName('globalContractQuotaAlert');
         // get contractQuotaAlert in database if exist
         $contractQuotaAlertObject = new PluginProjectbridgeContractQuotaAlert();
         $contractQuotaAlert = $contractQuotaAlertObject::getContractQuotaAlertByContractID($contractId);
@@ -1213,7 +1215,7 @@ public function showConfigFormForContract(Contract $entity, $selectedValue = 0)
         echo "<form method='post' name='form' action='".Toolbox::getItemTypeFormURL(__CLASS__)."'>";
 
         echo "<div class='form-group'>";
-        echo "<label for='percentage_quota'>".__('Percentage quota to send alert notification', 'projectbridge')."</label>";
+        echo "<label for='percentage_quota'>".__('Percentage quota to send alert notification', 'projectbridge')."</label> ";
         Dropdown::showFromArray('percentage_quota', range(0, 100), ['value'=>$selectedValue]);
         echo "</div>";
 

diff --git a/projectbridge.xml b/projectbridge.xml
@@ -87,6 +87,11 @@
          <compatibility>~9.5.11</compatibility>
          <download_url>https://github.com/Probesys/glpi-plugins-projectbridge/releases/download/v2.6.5/projectbridge-2.6.5.tbz</download_url>
       </version>
+      <version>
+         <num>2.6.6</num>
+         <compatibility>~9.5.11</compatibility>
+         <download_url>https://github.com/Probesys/glpi-plugins-projectbridge/releases/download/v2.6.6/projectbridge-2.6.6.tbz</download_url>
+      </version>
       <version>
          <num>2.7.0</num>
          <compatibility>~10.0.0</compatibility>
@@ -97,6 +102,11 @@
          <compatibility>~10.0.0</compatibility>
          <download_url>https://github.com/Probesys/glpi-plugins-projectbridge/releases/download/v2.7.1/projectbridge-2.7.1.tbz</download_url>
       </version>
+      <version>
+         <num>2.7.2</num>
+         <compatibility>~10.0.0</compatibility>
+         <download_url>https://github.com/Probesys/glpi-plugins-projectbridge/releases/download/v2.7.2/projectbridge-2.7.2.tbz</download_url>
+      </version>
    </versions>
    <langs>
       <lang>fr_FR</lang>

diff --git a/setup.php b/setup.php
@@ -1,7 +1,7 @@
 <?php
 
 
-define('PLUGIN_PROJECTBRIDGE_VERSION', '2.7.1');
+define('PLUGIN_PROJECTBRIDGE_VERSION', '2.7.2');
 
 define('PLUGIN_PROJECTBRIDGE_MIN_GLPI_VERSION', '10.0');
 define('PLUGIN_PROJECTBRIDGE_MAX_GLPI_VERSION', '11.0');