Fixe bud

core/class/lottery.class.php

@@ -34,6 +34,7 @@ class lottery
                 . "UCASE(" . DB_T_LOTTERY_INSCRITS . ".login) AS login, "
                 . "UCASE(" . DB_T_LOTTERY_INSCRITS . ".prenom) AS prenom, "
                 . "UCASE(" . DB_T_LOTTERY_INSCRITS . ".nom) AS nom, "
+                . "UCASE(" . DB_T_SALARIES . ".lieu) AS lieu, "
                 . "IF(" . DB_T_LOTTERY_INSCRITS . ".valide = 1, 'OUI', 'NON') AS valide, "
                 . "" . DB_T_LOTTERY_INSCRITS . ".selected, "
                 . "" . DB_T_LOTTERY_INSCRITS . ".cree, "

core/submit/cms.lottery-import-inscription.php

@@ -73,9 +73,35 @@ if (core::ifPost("from") AND core::getPost("from") == "lottery-import-inscriptio
                     }
 
                     db::query("INSERT INTO " . DB_T_LOTTERY_INSCRITS . " 
-                        (id_lottery, id_salarie, id_presta, id_dossier, login, prenom, nom, valide, id_user) 
-                        VALUES (:id_lottery, :id_salarie, :id_presta, :id_dossier, :login, :prenom, :nom, :valide, :id_user) 
-                        ON DUPLICATE KEY UPDATE id_salarie = :id_salarie, login = :login, prenom = :prenom, nom = :nom, valide = :valide");
+                        ( 
+                            id_lottery, 
+                            id_salarie, 
+                            id_presta, 
+                            id_dossier, 
+                            login, 
+                            prenom, 
+                            nom, 
+                            valide, 
+                            id_user
+                        ) 
+                        VALUES 
+                        (
+                            :id_lottery, 
+                            :id_salarie, 
+                            :id_presta, 
+                            :id_dossier, 
+                            :login, 
+                            :prenom, 
+                            :nom, 
+                            :valide, 
+                            :id_user
+                        ) 
+                        ON DUPLICATE KEY UPDATE 
+                        id_salarie = :id_salarie, 
+                        login = :login, 
+                        prenom = :prenom, 
+                        nom = :nom, 
+                        valide = :valide");
                     db::bind(':id_lottery', core::getPost("lottery"));
                     db::bind(':id_salarie', $tmp_id_salarie);
                     db::bind(':id_presta', $tmp_id_presta);

core/views/pages/cms.lottery-inscrits.php

@@ -20,16 +20,17 @@
     data-url="/json.php?jsonData=lottery-inscrits&id=<?php echo core::getGet("id") ?>">
     <thead>
         <tr>
-            <th data-sortable="true" data-field="id_presta" data-width="50" data-formatter="selectPrestation">Id Prestation</th>
-            <th data-sortable="true" data-field="id_dossier" data-filter-control="input" data-width="50" data-formatter="selectDossier">Id Dossier</th>
+            <th data-sortable="true" data-field="id_presta" data-width="50" data-formatter="selectPrestation">Prestation</th>
+            <th data-sortable="true" data-field="id_dossier" data-filter-control="input" data-width="50" data-formatter="selectDossier">Dossier</th>
             <th data-sortable="true" data-field="id_salarie" data-filter-control="input" data-width="50">Id Salarié</th>
-            <th data-sortable="true" data-field="actif" data-filter-control="select">Base RH</th>
-            <th data-sortable="true" data-field="valide" data-filter-control="select">Eligible</th>
-            <th data-sortable="true" data-field="login" data-filter-control="input">Login</th>
-            <th data-sortable="true" data-field="prenom" data-filter-control="input">Prénom</th>
-            <th data-sortable="true" data-field="nom" data-filter-control="input">Nom</th>
+            <th data-sortable="true" data-field="actif" data-filter-control="select" data-width="50">Base RH</th>
+            <th data-sortable="true" data-field="valide" data-filter-control="select" data-width="50">Eligible</th>
+            <th data-sortable="true" data-field="login" data-filter-control="input" data-width="150">Login</th>
+            <th data-sortable="true" data-field="prenom" data-filter-control="input" data-width="150">Prénom</th>
+            <th data-sortable="true" data-field="nom" data-filter-control="input" data-width="150">Nom</th>
+            <th data-sortable="true" data-field="lieu" data-filter-control="input" data-width="175">Rattachement</th>
             <th data-sortable="true" data-field="admin" data-filter-control="select">Chargé par</th>
-            <th data-sortable="true" data-field="cree">Le</th>
+            <th data-sortable="true" data-field="cree" data-width="175">Le</th>
         </tr>
     </thead>
 </table> 

core/views/pages/cms.lottery-upload-excel.php

@@ -1,5 +1,5 @@
 <?php 
-    $lottery = lottery::getFiche(core::getGet("id"))["sortDate"];
+    $lottery = lottery::getFiche(core::getGet("id"));
     if($lottery["sortDate"] != NULL){
         alert::recError("Action annulée car le tirage au sort a déjà été réalisé.");
         echo '<script>window.location.replace("/lottery-'.core::getGet("id").'.html");</script>';