Iñigo Valentin 8 anos atrás
pai
commit
ecfee33bfc

+ 5 - 4
www-admin/actividades/edit.php

@@ -110,12 +110,13 @@
                     $q_r = mysqli_query($con, "SELECT id, name FROM route;");
                     while ($r_i = mysqli_fetch_array($q_i)){
 ?>
-                        <div class='itinerary'>
+                        <div class='itinerary' id='itinerary_<?=$r_i["id"]?>'>
+                            <input type='button' class='delete_itinerary' onClick='deleteItinerary(<?=$r_i["id"]?>);' value='Borrar del itinerario'/>
                             Inicio:
-                            <input type='text' class='time' length='5' value='<?=substr($r_i["start"], 11, 5)?>' placeholder='HH:MM' onchange='updateItineraryStart("<?=$server?>", <?=$r_i["id"]?>, this)'/>
+                            <input type='text' class='time' length='5' value='<?=substr($r_i["start"], 11, 5)?>' placeholder='HH:MM' onChange='updateItineraryStart("<?=$server?>", <?=$r_i["id"]?>, this)'/>
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Fin (opcional):
-                            <input type='text' class='time' length='5' value='<?=substr($r_i["end"], 11, 5)?>' placeholder='HH:MM' onchange='updateItineraryEnd("<?=$server?>", <?=$r_i["id"]?>, this)'/>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br class='mobile'/>Localizaci&oacute;n:
+                            <input type='text' class='time' length='5' value='<?=substr($r_i["end"], 11, 5)?>' placeholder='HH:MM' onChange='updateItineraryEnd("<?=$server?>", <?=$r_i["id"]?>, this)'/>
+                            <br/>Localizaci&oacute;n:
                             <select onChange='togglePlaceRoute(<?=$r_i["id"]?>, this);'>
                                 <option value='place' selected>Un lugar</option>
                                 <option value='route'>Recorrido (opcional)</option>

+ 35 - 2
www-admin/actividades/script.js

@@ -14,6 +14,14 @@ function updateActivityDate(server, id, src){
     dbUpdate(server, "activity", "date", "DATE", id, src);
 }
 
+function updateItineraryStart(server, id, src){
+    // TODO: Validate date
+    // TODO: Fetch activity date
+    if (dbUpdate(server, "activity_itinerary", "start", "TIME", id, src)){
+        // TODO: Update input value
+    }
+}
+
 function dbUpdate(server, table, column, type, id, src){
     var value = src.value;
     var x = new XMLHttpRequest();
@@ -21,10 +29,35 @@ function dbUpdate(server, table, column, type, id, src){
     x.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     x.onreadystatechange = function(){
         if(x.readyState == 4){
-            console.log("STATUS: " + x.status);
             if(x.status == 200){
-                // TODO; Update!
+                // TODO; Update src!
+                return true;
+            }
+            else{
+                return false;
+            }
+        }
+    }
+}
+
+function deleteItinerary(id){
+    var value = src.value;
+    var x = new XMLHttpRequest();
+    x.open("GET", server + "/functions/db_delete.php?table=itinerary&id=" + id, true);
+    x.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    x.onreadystatechange = function(){
+        if(x.readyState == 4){
+            if(x.status == 200){
+                document.getElementById("itinerary_" + id).style.display = 'none';
+                return true;
+            }
+            else{
+                return false;
             }
         }
     }
 }
+
+function refreshItinerary(){
+    //TODO
+}

+ 6 - 0
www-admin/css/actividades.css

@@ -334,6 +334,12 @@ div.itinerary{
     border-left: solid 0.4em #0078ff;
 }
 
+div.itinerary input.delete_itinerary{
+    float: right;
+    border: 0.2em solid #ff7800;
+    background-color: #674512;
+}
+
 div.itinerary input.time{
     width: 5em;
 }

+ 16 - 3
www-admin/functions.php

@@ -279,14 +279,27 @@
                 $value = intval(mysqli_real_escape_string($con, $s_value));
                 break;
             case "DATE":
-                // TODO: Format date
-                $value = mysqli_real_escape_string($con, $s_value);
+                if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) \d{2}:\d{2}:\d{2}$/",$s_value)){
+                    return -2;
+                }
+                $value = "str_to_date('$s_value', '%Y-%m-%d')";
+                break;
+            case "TIME":
+                if (!preg_match("^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$",$s_value)){
+                    return -2;
+                }
+                $value = "str_to_date('$s_value', '%Y-%m-%d %H:%i:%s')";
                 break;
             default:
                 return -1;
         }
-        error_log("IVV db_update    UPDATE $table SET $column = $value WHERE id = $id;");
         $q = mysqli_query($con, "UPDATE $table SET $column = $value WHERE id = $id;");
         return 0;
     }
+
+    function db_delete($con, $s_table, $id){
+        $table = mysqli_real_escape_string($con, $s_table);
+        $q = mysqli_query($con, "DELETE FROM $table WHERE id = $id;");
+        return 0;
+    }
 ?>

+ 0 - 1
www-admin/functions/db_update.php

@@ -1,7 +1,6 @@
 <?php
     include("../functions.php");
     $con = startdb("rw");
-    error_log("IVV    update_db starting now");
     if (!checkSession($con)){
         error_log("Error updating $_GET[table].$_GET[column] : Session has expired.");
         http_response_code(403); // Forbidden

+ 1 - 1
www-admin/lablanca/index.php

@@ -127,7 +127,7 @@
                         <table id='prices'>
                             <tr>
                                 <th>Fecha</th>
-                                <th>Nombres</th
+                                <th>Nombres</th>
                                 <th>Precio</th>
                             </tr>
 <?php

+ 1 - 1
www-admin/main.php

@@ -112,7 +112,7 @@
                             <h3 class='section_title'>Ajustes</h3>
                             <div class='entry'>
                                 <ul>
-                                    <li><a href='<?=$server?>/settings/'Ajustes</a></li>
+                                    <li><a href='<?=$server?>/settings/'>Ajustes</a></li>
                                     <li><a href='<?=$server?>/users/'>Gestionar usuarios</a></li>
                                     <li><a href='<?=$server?>/salir/'>Salir</a></li>
                                 </ul>

+ 1 - 1
www-admin/toolbar.php

@@ -123,7 +123,7 @@
     <table>
         <tr>
             <td>
-                <a href='<?=$server?>/settings/'Ajustes</a>
+                <a href='<?=$server?>/settings/'>Ajustes</a>
             </td>
             <td>
                 <a href='<?=$server?>/usuarios/'>Gestionar usuarios</a>