stany.ferer преди 1 година
родител
ревизия
a105920c53

+ 6 - 1
core/class/document.class.php

@@ -40,7 +40,12 @@ class document
             . "* "
             . "FROM " . DB_T_TYPE_DOCUMENT . " "
             . "ORDER BY " . DB_T_TYPE_DOCUMENT . ".id ASC");
-        return db::resultset();
+
+        $return = [];
+        foreach (db::resultset() as $key => $value) {
+            $return[$key] = $value["label"];
+        }
+        return $return;
     }
 
     public static function delete(float $_id)

+ 1 - 1
core/submit/cms.parametres-reset-datas.php

@@ -1,6 +1,6 @@
 <?php
 
-if((ENVIRONNEMENT == "DEV" OR ENVIRONNEMENT == "PREPROD")) {
+if((ENVIRONNEMENT == "DEV" OR ENVIRONNEMENT == "R7" OR ENVIRONNEMENT == "PREPROD")) {
     core::resetDatas();
 
     historique::recRef("/parametres.html");

+ 3 - 0
core/views/_cms.nav.php

@@ -3,6 +3,9 @@
     if(ENVIRONNEMENT == "DEV"){
         $titleEnvironnement = "<a href=\"/\"><span class=\"badge\" style=\"background-color:red; margin-left:5px;\">DEV</span></a>";
         $classHead = "bg-secondary";
+    } elseif(ENVIRONNEMENT == "R7"){
+        $titleEnvironnement = "<a href=\"/\"><span class=\"badge\" style=\"background-color:red; margin-left:5px;\">R7</span></a>";
+        $classHead = "bg-secondary";
     } elseif(ENVIRONNEMENT == "PREPROD"){
         $titleEnvironnement = "<a href=\"/\"><span class=\"badge\" style=\"background-color:red; margin-left:5px;\">PREPROD</span></a>";
         $classHead = "bg-secondary";

+ 2 - 0
core/views/_events.nav.php

@@ -1,6 +1,8 @@
 <?php
     if(ENVIRONNEMENT == "DEV"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red; margin-left: 5px;\">DEV</span>";
+    } elseif(ENVIRONNEMENT == "R7"){
+        $titleHead = "<span class=\"badge\" style=\"background-color:red; margin-left: 5px;\">R7</span>";
     } elseif(ENVIRONNEMENT == "PREPROD"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red; margin-left: 5px;\">PREPROD</span>";
     } elseif(ENVIRONNEMENT == "PROD"){

+ 4 - 4
core/views/pages/cms.document.php

@@ -91,10 +91,10 @@ if (isset($document["id"])) {
                 <label>Type de document</label>
                 <select name="id_type" class="form-select">
                     <option value=""></option>
-                    <option value="1" <?php core::printFormSelectOption($_type_document, 1) ?>><?php echo $_label_type_document[1]["label"] ?></option>
-                    <option value="2" <?php core::printFormSelectOption($_type_document, 2) ?>><?php echo $_label_type_document[2]["label"] ?></option>
-                    <option value="3" <?php core::printFormSelectOption($_type_document, 3) ?>><?php echo $_label_type_document[3]["label"] ?></option>
-                    <option value="0" <?php core::printFormSelectOption($_type_document, 0) ?>><?php echo $_label_type_document[0]["label"] ?></option>
+                    <option value="1" <?php core::printFormSelectOption($_type_document, 1) ?>><?php echo $_label_type_document[1] ?></option>
+                    <option value="2" <?php core::printFormSelectOption($_type_document, 2) ?>><?php echo $_label_type_document[2] ?></option>
+                    <option value="3" <?php core::printFormSelectOption($_type_document, 3) ?>><?php echo $_label_type_document[3] ?></option>
+                    <option value="0" <?php core::printFormSelectOption($_type_document, 0) ?>><?php echo $_label_type_document[0] ?></option>
                 </select>
             </div>
             <br />

+ 1 - 1
core/views/pages/cms.parametres-debug.php

@@ -7,7 +7,7 @@
                     <a href="/submit.php?from=parametres-json-refresh" onclick="return confirm('Etes-vous certain de vouloir réinitialiser les JSON ?')"><button type="button" class="btn btn-warning">Réinitialisation des JSON</button></a>
                 </div>
         </td>
-        <?php if (session::getType() == 1 and (ENVIRONNEMENT == "DEV" or ENVIRONNEMENT == "PREPROD")) { ?>
+        <?php if (session::getType() == 1 and (ENVIRONNEMENT == "DEV" OR ENVIRONNEMENT == "R7" OR ENVIRONNEMENT == "PREPROD")) { ?>
         <td>
             <h4>Outils de débug</h4>
             <div class="element-parametres">

+ 2 - 0
core/views/pages/events.login-control.php

@@ -1,6 +1,8 @@
 <?php
     if(ENVIRONNEMENT == "DEV"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red;\">DEV</span>";
+    } elseif(ENVIRONNEMENT == "R7"){
+        $titleHead = "<span class=\"badge\" style=\"background-color:red;\">R7</span>";
     } elseif(ENVIRONNEMENT == "PREPROD"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red;\">PREPROD</span>";
     } elseif(ENVIRONNEMENT == "PROD"){

+ 2 - 0
core/views/pages/events.login-salarie.php

@@ -1,6 +1,8 @@
 <?php
     if(ENVIRONNEMENT == "DEV"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red;\">DEV</span>";
+    } elseif(ENVIRONNEMENT == "R7"){
+        $titleHead = "<span class=\"badge\" style=\"background-color:red;\">R7</span>";
     } elseif(ENVIRONNEMENT == "PREPROD"){
         $titleHead = "<span class=\"badge\" style=\"background-color:red;\">PREPROD</span>";
     } elseif(ENVIRONNEMENT == "PROD"){