Add tagsUser on Documents

core/class/document.class.php

@@ -54,17 +54,17 @@ class document
         $file = core::getFiles("document-import"); 
         $idFile = self::uploadFile($file); 
 
-        $tags = tags::textToId(core::getPost("tags"));
+        $tagsUser = tags::textToId(core::getPost("tagsUser"));
 
         if($idFile != NULL){
-            db::query("INSERT INTO " . DB_T_DOCUMENTS . " (id_type, id_file, titre, date, deadline, description, tags) VALUES (:id_type, :id_file, :titre, :date, :deadline, :description, :tags)");
+            db::query("INSERT INTO " . DB_T_DOCUMENTS . " (id_type, id_file, titre, date, deadline, description, tagsUser) VALUES (:id_type, :id_file, :titre, :date, :deadline, :description, :tagsUser)");
             db::bind(':id_type', core::getPost("id_type"));
             db::bind(':id_file', $idFile);
             db::bind(':titre', core::getPost("titre"));
             db::bind(':date', core::getPost("date"));
             db::bind(':deadline', core::getPost("deadline"));
             db::bind(':description', core::getPost("description"));
-            db::bind(':tags', $tags);
+            db::bind(':tagsUser', $tagsUser);
             
             try {
                     db::execute();
@@ -84,7 +84,7 @@ class document
 
     public static function update()
     {
-        $tags = tags::textToId(core::getPost("tags"));
+        $tagsUser = tags::textToId(core::getPost("tagsUser"));
 
         if(core::ifPost("done") AND core::getPost("done") == TRUE){
             $sql = "id_user_done = :id_user_done, date_done = CURRENT_TIMESTAMP, ";
@@ -99,7 +99,7 @@ class document
                 . "deadline = :deadline, "
                 . "description = :description, "
                 . $sql
-                . "tags = :tags "
+                . "tagsUser = :tagsUser "
                 . "WHERE id = :id");
         
         db::bind(':id_type', core::getPost("id_type"));
@@ -107,7 +107,7 @@ class document
         db::bind(':date', core::getPost("date"));
         db::bind(':deadline', core::getPost("deadline"));
         db::bind(':description', core::getPost("description"));
-        db::bind(':tags', $tags);
+        db::bind(':tagsUser', $tagsUser);
         db::bind(':id', core::getPost("id"));
 
         if(core::ifPost("done") AND core::getPost("done") == TRUE){
@@ -152,7 +152,7 @@ class document
             . "" . DB_T_DOCUMENTS . ".date, "
             . "" . DB_T_DOCUMENTS . ".deadline, "
             . "" . DB_T_DOCUMENTS . ".description, "
-            . "" . DB_T_DOCUMENTS . ".tags, "
+            . "" . DB_T_DOCUMENTS . ".tagsUser, "
             . "" . DB_T_DOCUMENTS . ".id_user_done, "
             . "" . DB_T_DOCUMENTS . ".date_done, "
             . "CONCAT(" . DB_T_USER . ".prenom, ' ', " . DB_T_USER . ".nom) AS doneUser, "
@@ -164,7 +164,7 @@ class document
             . "WHERE " . DB_T_DOCUMENTS . ".id = :id");
         db::bind(':id', $_id);
         $row = db::single();
-        $row["tags"] = tags::idToTtext($row["tags"]);
+        $row["tagsUser"] = tags::idToTtext($row["tagsUser"]);
         return $row;
     }
 

core/class/json.class.php

@@ -200,7 +200,7 @@ class json extends db
         " . DB_T_DOCUMENTS . ".date, 
         " . DB_T_DOCUMENTS . ".deadline, 
         " . DB_T_DOCUMENTS . ".description, 
-        " . DB_T_DOCUMENTS . ".tags, 
+        " . DB_T_DOCUMENTS . ".tagsUser, 
         IF(" . DB_T_DOCUMENTS . ".id_user_done IS NOT NULL, 'Traité', 'Non traité') AS done, 
         " . DB_T_FILES . ".name, 
         " . DB_T_TYPE_DOCUMENT . ".label, 
@@ -215,7 +215,7 @@ class json extends db
 
         foreach ($return as $key => $docs) {
             $row[$key] = $docs;
-            $row[$key]["tags"] = tags::idToTtext($docs["tags"]);
+            $row[$key]["tagsUser"] = tags::idToTtext($docs["tagsUser"]);
         }
 
         if (file_put_contents(DIR_DATAS_JSON . "documents.json", json_encode($row))) {

core/views/pages/cms.document.php

@@ -46,7 +46,7 @@ echo core::filAriane(array(
     )
 ));
 
-if(isset($document["id"]) AND tags::compareUserDocument($userTags, $document["tags"]) == FALSE ){ 
+if(isset($document["id"]) AND tags::compareUserDocument($userTags, $document["tagsUser"]) == FALSE ){ 
 ?>
     <div style="float:right; margin-top: -60px;">
         <a href="/submit.php?from=document-delete&id=<?php echo $document["id"] ?>" style="color: #dc3545; text-decoration:none;" onclick="return confirm('Voulez-vous supprimer ce document ?')"><button type="submit" class="btn btn-outline-danger btn-sm"><span data-feather="trash-2"></span> Supprimer</button></a>
@@ -110,18 +110,18 @@ if(isset($document["id"]) AND tags::compareUserDocument($userTags, $document["ta
             </div>
             <br />
 
-            <?php $_assign_document = (isset($document["tags"])) ? $document["tags"] : NULL; ?>
+            <?php $_assign_document = (isset($document["tagsUser"])) ? $document["tagsUser"] : NULL; ?>
             <div class="form-group">
                 <label>Attribution</label>
                 <input type="text" value="<?php
-                if (isset($document["tags"])) {
-                    echo $document["tags"];
+                if (isset($document["tagsUser"])) {
+                    echo $document["tagsUser"];
                 }
-                ?>" name="tags" id="tags" />
+                ?>" name="tagsUser" id="tagsUser" />
             </div>
             <br />
 
-            <?php if(isset($document) AND tags::compareUserDocument($userTags, $document["tags"]) == TRUE){ 
+            <?php if(isset($document) AND tags::compareUserDocument($userTags, $document["tagsUser"]) == TRUE){ 
                 $checkDone = (isset($document["id_user_done"])) ? " checked disabled" : NULL;
                 $checkText = (isset($document["id_user_done"])) ? "Ce document a été traité par ". $document["doneUser"] . " le " . $document["date_done"] : "Ce document a été traité";
             ?>
@@ -182,12 +182,20 @@ if(isset($document["id"]) AND tags::compareUserDocument($userTags, $document["ta
     }
 
     $(document).ready(function () {
-        $('#tags').inputTags({
+        $('#tagsUser').inputTags({
             autocomplete: {
                 values: <?php echo tags::getJquery(1) ?>,
                 only: true
             },
             max: 3
         });
+
+        $('#tagsSupplier').inputTags({
+            autocomplete: {
+                values: <?php echo tags::getJquery(2) ?>,
+                only: true
+            },
+            max: 3
+        });
     });
 </script>

core/views/pages/cms.documents.php

@@ -51,7 +51,7 @@
                 <th data-sortable="true" data-field="deadeline" data-filter-control="input" data-width="110">Echéance</th>
                 <th data-sortable="true" data-field="name" data-filter-control="input" data-width="350">Fichier</th>
                 <th data-sortable="true" data-field="size" data-filter-control="input" data-width="50">Taille</th>
-                <th data-sortable="true" data-field="tags" data-filter-control="input">Attribution</th>
+                <th data-sortable="true" data-field="tagsUser" data-filter-control="input">Attribution</th>
                 <th data-sortable="true" data-field="user" data-filter-control="input" data-width="120">Créé par</th>
                 <th data-sortable="true" data-field="done" data-filter-control="select" data-width="50">Statut</th>
                 <th data-field="id" data-formatter="selectFormatter" data-width="60"></th>

maj/sql/maj.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE `documents` CHANGE `tags` `tagsUser` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL;