Currently in a rush, so committing a lot of stuff without consistency. Please note that the JS event handlers don't work right now

controllers/document.php

@@ -5,7 +5,7 @@ require_once(dirname(__DIR__) . "/models/promo.class.php");
 
 function document()
 {
-    set("title", "Document");
+    set("title", "Documents");
     set("data", Document::getAll());
     set("promos", Promo::getAll());
 
@@ -14,11 +14,15 @@ function document()
 
 function add_document()
 {
-    Document::addDocument($_FILES["document"], [
+    $filePath = Document::addDocument($_FILES["document"], [
         "rang" => $_POST["rang"],
         "promo" => $_POST["promo"],
         "libelle" => $_POST["libelle"]
     ]);
+
+    json_encode(array(
+        "path" => $filePath
+    ));
 }
 
 function delete_document($fileid)

controllers/login.php

@@ -4,6 +4,11 @@ require_once(dirname(__DIR__)."/controllers/data.php");
 require_once(dirname(__DIR__)."/models/data.class.php");
 require_once(dirname(__DIR__)."/../DbIds.php");
 
+function getAdminIdentifiers()
+{
+    return ["toto", "tata"];
+}
+
 function login()
 {
     set("title", "Login");

controllers/promo.php

@@ -18,15 +18,15 @@ function add_promo()
     ]);
 }
 
-function alter_promo()
+function alter_promo($promoid)
 {
-    $promo = new Promo($_POST["id"]);
+    $promo = new Promo($promoid);
     
     $promo->setLibelle($_POST["libelle"]);
     $promo->write();
 }
 
-function delete_promo()
+function delete_promo($promoid)
 {
-    (new Promo($_POST["promo"]))->erase();
+    (new Promo($promoid))->erase();
 }

lib/platypuce.js

@@ -1,26 +1,81 @@
-var dataSelect = $("option")[0].value;
+var dataSelect = "";
+
+function checkPromoId(promoid)
+{
+    return promoid.match(/A[1-5]/) != null;
+}
+
+if($("title").text() === "Documents") {
+    dataSelect = $("option")[0].value;
+}
 
 $(document).on('change', 'select', function(e) {
-    dataSelect = this.options[e.target.selectedIndex].value;
+    if($("title").text() === "Documents") {
+        dataSelect = this.options[e.target.selectedIndex].value;
+    }
 });
 
-$('#addForm').submit(function(e) {
+$('.fa-pencil').on("click", function() {
+    var row = $(this).parent().parent();
+    var rang = $(row.children()[0]);
+    var rangValeur = rang.html();
+    rang.html('<input type="number" value="'+rangValeur+'" size="2" style="width:35px" />');
+    $(this).addClass("fa-check");
+    $(this).removeClass("fa-pencil");
+    $(this).off("click");
+    $(this).on("click", function () {
+        rangValeur = $(rang.children()[0]).value;
+        rang.html(rangValeur);
+    });
+});
 
+$('#addForm').submit(function(e) {
     e.preventDefault();
     var data = new FormData();
-    data.append("document", $("#file")[0].files[0]);
-    data.append("promo", dataSelect);
-    data.append("rang", $("#rang").val());
-    data.append("libelle", $("#libelle").val());
-
-    $.ajax({
-        method: "POST",
-        url: "document",
-        data: data,
-        processData: false,
-        contentType: false,
-        complete: function (result) {
-            console.log(result);
-        }
-    });
+
+    switch ($("title").html())
+    {
+        case "Documents":
+            data.append("document", $("#file")[0].files[0]);
+            data.append("promo", dataSelect);
+            data.append("rang", $("#rang").val());
+            data.append("libelle", $("#libelle").val());
+
+            $.ajax({
+                method: "POST",
+                url: "document",
+                data: data,
+                dataType: 'json',
+                processData: false,
+                contentType: false,
+                complete: function (result) {
+
+                }
+            });
+            break;
+        case "Promotions":
+            if(checkPromoId($("#id").val()))
+            {
+                data.append("id", $("#id").val());
+                data.append("libelle", $("#libelle").val());
+
+                $.ajax({
+                    method: "POST",
+                    url: "promo",
+                    data: data,
+                    processData: false,
+                    contentType: false,
+                    complete: function (result) {
+                        console.log(result);
+                    }
+                });
+            }
+            else
+            {
+                var block = $(".form-group:first-child");
+                block.addClass("has-error");
+                block.html(block.html()+'<span id="helpBlock2" class="help-block">Votre identifiant doit contenir "A" suivi de l\'année correspondant à la promotion.</span>')
+            }
+            break;
+    }
 });

models/data.class.php

@@ -13,13 +13,13 @@ class Data
     private $date;
     private $ip;
 
-    function __construct($email)
+    function __construct($id)
     {
         $bdd = new Connector();
 
         $data = $bdd->Select("*", "data", array(
             "where" => array(
-                array("identifiant", "=", $email)
+                array("id", "=", $id)
             )
         ));
 
@@ -31,7 +31,7 @@ class Data
         $data = $data[0];
 
         // Chargement des informations
-        $this->identifiant = $email;
+        $this->identifiant = $data["identifiant"];
         $this->nom_fils = $data["nom_fils"];
         $this->prenom_fils = $data["prenom_fils"];
         $this->ddn_fils = $data["ddn_fils"];
@@ -232,7 +232,15 @@ class Data
     public static function getAll()
     {
         $bdd = new Connector();
-        return $bdd->Select("*", "data");
+        $datas = $bdd->Select("*", "data");
+        $toReturn = array();
+
+        foreach ($datas as $data) {
+            $doc = new Data($data["id"]);
+            array_push($toReturn, self::toArray($doc));
+        }
+
+        return $toReturn;
     }
 
     function erase()
@@ -240,4 +248,18 @@ class Data
         $bdd = new Connector();
         $bdd->Delete("data", array(array("identifiant", "=", $this->identifiant)));
     }
+
+    public static function toArray($data)
+    {
+        return array(
+            "Identifiant" => $data->identifiant,
+            "Nom" => $data->nom_fils,
+            "Prénom" => $data->prenom_fils,
+            "Date de naissance" => $data->ddn_fils,
+            "Téléphone portable" => $data->tel_mobile,
+            "Adresse courriel du parent" => $data->courriel,
+            "Date d'enregistrement" => $data->date,
+            "Adresse IP" => $data->ip
+        );
+    }
 }

models/document.class.php

@@ -63,20 +63,25 @@ class Document
         }
 
         // Determining the folder to put the document in
-        if (strstr($filename, "A1") || strstr($filename, "A2")) {
-            error_log("A1\n");
+        if (preg_match("/A[12]/", $options["promo"])) {
             $destination = "A12/" . $filename;
-        } elseif (strstr($filename, "A3") || strstr($filename, "A4") || strstr($filename, "A5")) {
-            error_log("A3\n");
+        } elseif (preg_match("/A[345]/", $options["promo"])) {
             $destination = "A345/" . $filename;
         } else {
-            error_log("meh\n");
             $destination = $filename;
         }
 
         error_log($destination);
 
-        move_uploaded_file($document["tmp_name"], __DIR__ . "../../pdf/" . $destination);
+        if(move_uploaded_file($document["tmp_name"], __DIR__ . "/../../pdf/" . $destination))
+        {
+            echo "Uploaded!";
+        }
+        else
+        {
+            echo ":'((((";
+            error_log("Error when trying to write ".__DIR__ . "/../../pdf/" . $destination);
+        }
 
         foreach ($options as $key => $value) {
             if (empty($value) && $key != "promo") {
@@ -90,6 +95,8 @@ class Document
             "libelle" => $options["libelle"],
             "fichier" => $destination
         ));
+
+        return $destination;
     }
 
     function erase()

models/promo.class.php

@@ -30,7 +30,15 @@ class Promo
     public static function getAll()
     {
         $bdd = new Connector();
-        return $bdd->Select("*", "promo");
+        $promos = $bdd->Select("*", "promo");
+        $toReturn = array();
+
+        foreach ($promos as $promo) {
+            $doc = new Promo($promo["id_promo"]);
+            array_push($toReturn, self::toArray($doc));
+        }
+
+        return $toReturn;
     }
 
     /**
@@ -111,4 +119,12 @@ class Promo
             "libelle" => $promo["libelle"]
         ));
     }
+
+    public static function toArray($promo)
+    {
+        return array(
+            "Identifiant" => $promo->id_promo,
+            "Libellé" => $promo->libelle
+        );
+    }
 }

views/layout.html.php

@@ -3,10 +3,9 @@
 <html>
     <head>
         <meta charset = "utf-8">
-        <title>
-            <?php echo $title; ?>
-        </title>
+        <title><?php echo $title; ?></title>
         <link rel="stylesheet" href="lib/bootstrap.min.css" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
         <script src="lib/jquery-2.1.4.min.js"></script>
         <script src="lib/jquery.tablesorter.min.js"></script>
         <script src="lib/bootstrap.min.js"></script>

views/list.html.php

@@ -1,40 +1,64 @@
-<div style="text-align:right">
+<?php if($title == "Documents" || $title == "Promotions")
+{
+    echo '<div style="text-align:right">
     <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#addForm" aria-expanded="false" aria-controls="addForm">
         Ajouter
     </button>
-</div>
+</div>';
+}
+?>
+
 
 <form class="collapse" id="addForm">
-    <div class="well">
+    <?php
+        switch($title)
+        {
+            case "Documents":
+                echo '<div class="well">
         <div class="form-group">
             <label for="promo">Promotion :</label>
-            <select id="promo">
-                <?php foreach($promos as $promo)
+            <select id="promo">';
+                foreach($promos as $promo)
                 {
-                    ?>
-                    <option value="<?php echo $promo["id_promo"]; ?>"><?php echo $promo["libelle"]; ?></option>
-                    <?php
+                    echo '<option value="'.$promo["Identifiant"].'">'.$promo["Libellé"].'</option>';
                 }
-                ?>
-                <option value=""></option>
+                echo '<option value=""></option>
             </select>
         </div>
         <div class="form-group">
-            <label for="rang">Rang :</label>
+            <label class="control-label" for="rang">Rang :</label>
             <input type="number" class="form-control" id="rang" />
         </div>
         <div class="form-group">
-            <label for="libelle">Libellé : </label>
+            <label class="control-label" for="libelle">Libellé : </label>
             <input type="text" class="form-control" id="libelle" placeholder="Libellé" />
         </div>
         <div class="form-group">
-            <label for="file">Fichier :</label>
+            <label class="control-label" for="file">Fichier :</label>
             <input type="file" id="file" />
         </div>
         <div class="form-group">
             <input type="submit" class="form-control" value="Ajouter le document" id="formsubmit" />
         </div>
-    </div>
+    </div>';
+                break;
+            case "Promotions":
+                echo '<div class="well">
+        <div class="form-group">
+            <label class="control-label" for="id">Identifiant :</label>
+            <input type="text" class="form-control" id="id" placeholder="Identifiant" />
+        </div>
+        <div class="form-group">
+            <label class="control-label" for="libelle">Libellé : </label>
+            <input type="text" class="form-control" id="libelle" placeholder="Libellé" />
+        </div>
+        <div class="form-group">
+            <input type="submit" class="form-control" value="Ajouter la promotion" id="formsubmit" />
+        </div>
+    </div>';
+                break;
+        }
+    ?>
 </form>
 
 <table class="table tablesorter table-striped" id="mainTable">
@@ -48,11 +72,11 @@
     <th>Opérations</th>
     </thead>
     <tbody>
-    <?php foreach ($data as $student) {
+    <?php foreach ($data as $element) {
         ?>
         <tr>
             <?php
-            foreach ($student as $field => $value) {
+            foreach ($element as $field => $value) {
                 if (is_array($value)) {
                     ?>
                     <td id="<?php echo $value["id"]; ?>"><?php echo $value["libelle"]; ?></td>
@@ -64,6 +88,7 @@
                 }
             }
             ?>
+            <td><i class="fa fa-pencil" style="cursor:pointer"></i></td>
         </tr>
         <?php
     }