Bladeren bron

Add attach documents

stany.ferer 1 jaar geleden
bovenliggende
commit
5d6925f8a5
2 gewijzigde bestanden met toevoegingen van 6 en 3 verwijderingen
  1. 2 0
      core/class/json.class.php
  2. 4 3
      core/views/pages/cms.documents.php

+ 2 - 0
core/class/json.class.php

@@ -211,6 +211,7 @@ class json extends db
         " . DB_T_DOCUMENTS . ".date,        
         " . DB_T_DOCUMENTS . ".deadline, 
         " . DB_T_DOCUMENTS . ".description, 
+        " . DB_T_CLIENTS . ".label AS attach, 
         " . DB_T_DOCUMENTS . ".montant, 
             ( SELECT GROUP_CONCAT(" . DB_T_TAGS . ".label SEPARATOR ', ') 
             FROM  " . DB_T_DOCUMENT_TAGS . " 
@@ -225,6 +226,7 @@ class json extends db
         IF(" . DB_T_DOCUMENTS . ".id_user_done IS NOT NULL, 'Traité', 'Non traité') AS done, 
         " . DB_T_TYPE_DOCUMENT . ".label
         FROM " . DB_T_DOCUMENTS . " 
+        LEFT JOIN " . DB_T_CLIENTS . " ON " . DB_T_CLIENTS . ".id = " . DB_T_DOCUMENTS . ".id_client 
         INNER JOIN " . DB_T_TYPE_DOCUMENT . " ON " . DB_T_TYPE_DOCUMENT . ".id = " . DB_T_DOCUMENTS . ".id_type" . $where);
 
         $row =  db::resultset();

+ 4 - 3
core/views/pages/cms.documents.php

@@ -42,10 +42,11 @@ echo core::filAriane(array(
         data-url="<?php echo $jsonTarget ?>">
         <thead>
             <tr>
-                <th data-sortable="true" data-field="date" data-filter-control="input" data-width="100">Date</th>
+                <th data-sortable="true" data-field="date" data-filter-control="input" data-width="90">Date</th>
                 <th data-sortable="true" data-field="titre" data-filter-control="input">Titre</th>
-                <th data-sortable="true" data-field="label" data-filter-control="select" data-width="180">Type</th>
-                <th data-sortable="true" data-field="deadline" data-filter-control="input" data-width="100">Echéance</th>
+                <th data-sortable="true" data-field="label" data-filter-control="select" data-width="125">Type</th>
+                <th data-sortable="true" data-field="attach" data-filter-control="select" data-width="180">Attachement</th>
+                <th data-sortable="true" data-field="deadline" data-filter-control="input" data-width="90">Echéance</th>
                 <th data-sortable="true" data-field="tags" data-filter-control="input" data-width="200">Tags</th>
                 <th data-sortable="true" data-field="assign" data-filter-control="select" data-width="200">Attribution</th>
                 <th data-sortable="true" s data-field="done" data-filter-control="select" data-width="100">Statut</th>