From 7779d189df07f902b3758852036778b76f378307 Mon Sep 17 00:00:00 2001
From: Chris <christian@haschek.at>
Date: Mon, 23 Oct 2023 10:00:19 +0200
Subject: [PATCH] hundedaten jetzt korrekt

---
 web/inc/classes/Model.class.php |  5 +--
 web/models/Dog.model.php        |  4 +-
 web/pages/dogs/controller.php   |  6 ++-
 web/pages/dogs/list.html        | 77 +++++++++++++++------------------
 web/pages/home/home.html        |  2 +-
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/web/inc/classes/Model.class.php b/web/inc/classes/Model.class.php
index 31f70f1..330e0af 100644
--- a/web/inc/classes/Model.class.php
+++ b/web/inc/classes/Model.class.php
@@ -65,13 +65,10 @@ class Model {
         {
             if(isset($this->data[$field]))
             {
-                error_log($field.' -> '.$options['type']);
                 if($options['type']=='array')
                     $GLOBALS['redis']->hset($this->dbTable.':'.$this->id,$field,json_encode($this->data[$field]));
                 else
                 {
-                    
-                    error_log("hset $this->dbTable:$this->id $field {$this->data[$field]}");
                     $GLOBALS['redis']->hset($this->dbTable.':'.$this->id,$field,$this->data[$field]);
                 }
             }
@@ -85,7 +82,7 @@ class Model {
     {
         $this->id = $id;
         if(!$GLOBALS['redis']->exists($this->dbTable.':'.$this->id))
-            return false;
+            throw new Exception($this->dbTable.':'.$this->id.' not found');
         $keys = array_keys($this->dbFields);
 
         foreach($keys as $key)
diff --git a/web/models/Dog.model.php b/web/models/Dog.model.php
index 72a6643..96a0afe 100644
--- a/web/models/Dog.model.php
+++ b/web/models/Dog.model.php
@@ -9,8 +9,8 @@ class Dog extends Model {
         'kennel_name' =>   ['type'=>'text'],
         'breed' =>   ['type'=>'text'],
         'size' =>   ['type'=>'text'], //in cm
-        'birthday' => ['type'=>'int'], //unix timestamp
-        'agility_size' =>   ['type'=>'int'], //S,M,I,L
+        'birthday' => ['type'=>'text'],
+        'agility_size' =>   ['type'=>'text'], //S,M,I,L
         'active' =>   ['type'=>'int','default'=>1]
     );
     
diff --git a/web/pages/dogs/controller.php b/web/pages/dogs/controller.php
index e3eedf5..a81f07f 100644
--- a/web/pages/dogs/controller.php
+++ b/web/pages/dogs/controller.php
@@ -19,14 +19,18 @@ class Dogs extends Page {
         $dogs = $_SESSION['user']->data['dogs'];
         $doggos = [];
 
-        foreach($dogs as $dogid)
+        foreach($dogs as $key => $dogid)
         {
+            //var_dump($dogid);
             $dog = new Dog();
             try{
                 $dog->load($dogid);
             }
             catch(Exception $e)
             {
+                error_log("Dog $dogid not found. Deleting from user");
+                unset($_SESSION['user']->data['dogs'][$key]);
+                $_SESSION['user']->save();
                 continue;
             }
             if($dog->data)
diff --git a/web/pages/dogs/list.html b/web/pages/dogs/list.html
index 96bfe65..45a91f1 100644
--- a/web/pages/dogs/list.html
+++ b/web/pages/dogs/list.html
@@ -1,48 +1,43 @@
 <h1 class="text-2xl p-6 text-center">Meine Hunde</h1>
 
-<div class="container flex justify-center mx-auto">
-    <div class="flex flex-col">
-        <div class="w-full">
-            <div class="border-b border-gray-200 shadow">
-                <table class="divide-y divide-gray-300 ">
-                    <thead class="bg-gray-50">
-                        <tr>
-                            <?php foreach (array_keys($doggos[0]) as $key) : ?>
-                            <th class="px-6 py-2 text-xs text-gray-500">
-                                <?= $key ?>
-                            </th>
-                            <?php endforeach; ?>
 
-                            <th class="px-6 py-2 text-xs text-gray-500">
-                                Bearbeiten
-                            </th>
-                            <th class="px-6 py-2 text-xs text-gray-500">
-                                Löschen
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody class="bg-white divide-y divide-gray-300">
-                        <?php foreach ($doggos as $dog) : ?>
+<div class="border-b border-gray-200 shadow overflow-x">
+    <table class="divide-y divide-gray-300 table-auto overflow-scroll w-ful">
+        <thead class="bg-gray-50">
+            <tr>
+                <?php foreach (array_keys($doggos[0]) as $key) : ?>
+                <th class="px-6 py-2 text-xs text-gray-500">
+                    <?= $key ?>
+                </th>
+                <?php endforeach; ?>
 
-                        <tr class="whitespace-nowrap">
-                            <?php foreach (array_keys($dog) as $key) : ?>
-                            <td class="px-6 py-4 text-sm text-gray-500">
-                                <?= $dog[$key] ?>
-                            </td>
-                            <?php endforeach; ?>
+                <th class="px-6 py-2 text-xs text-gray-500">
+                    Bearbeiten
+                </th>
+                <th class="px-6 py-2 text-xs text-gray-500">
+                    Löschen
+                </th>
+            </tr>
+        </thead>
+        <tbody class="bg-white divide-y divide-gray-300">
+            <?php foreach ($doggos as $dog) : ?>
 
-                            <td class="px-6 py-4">
-                                <button hx-get="/dogs/edit/<?= $dog['id'] ?>" hx-push-url="/dogs/edit/<?= $dog['id'] ?>" hx-target="#main" class="px-4 py-1 text-sm text-indigo-600 bg-indigo-200 rounded-full">Bearbeiten</button>
-                            </td>
-                            <td class="px-6 py-4">
-                                <button hx-get="/dogs/delete/<?= $dog['id'] ?>" hx-target="#main" class="px-4 py-1 text-sm text-red-400 bg-red-200 rounded-full">Löschen</button>
-                            </td>
-                        </tr>
+            <tr class="whitespace-nowrap">
+                <?php foreach (array_keys($dog) as $key) : ?>
+                <td class="px-6 py-4 text-sm text-gray-500">
+                    <?= $dog[$key] ?>
+                </td>
+                <?php endforeach; ?>
 
-                        <?php endforeach; ?>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
+                <td class="px-6 py-4">
+                    <button hx-get="/dogs/edit/<?= $dog['id'] ?>" hx-push-url="/dogs/edit/<?= $dog['id'] ?>" hx-target="#main" class="px-4 py-1 text-sm text-indigo-600 bg-indigo-200 rounded-full">Bearbeiten</button>
+                </td>
+                <td class="px-6 py-4">
+                    <button hx-get="/dogs/delete/<?= $dog['id'] ?>" hx-target="#main" class="px-4 py-1 text-sm text-red-400 bg-red-200 rounded-full">Löschen</button>
+                </td>
+            </tr>
+
+            <?php endforeach; ?>
+        </tbody>
+    </table>
 </div>
\ No newline at end of file
diff --git a/web/pages/home/home.html b/web/pages/home/home.html
index 83de1e4..56ed9ed 100644
--- a/web/pages/home/home.html
+++ b/web/pages/home/home.html
@@ -20,7 +20,7 @@
     <div class="flex flex-col">
         <div class="w-full">
             <div class="border-b border-gray-200 shadow">
-                <table class="divide-y divide-gray-300 ">
+                <table class="divide-y divide-gray-300 table-auto overflow-x-scroll w-full">
                     <thead class="bg-gray-50">
                         <tr>
                             <?php foreach (array_keys($userdata[0]) as $key) : ?>