Merge branch 'fronkdev' into 'master'

Added timestamps to AddressDB export

See merge request fronk/thetool!607

application/ADBHausnummer/ADBHausnummer.php

@@ -49,7 +49,24 @@ class ADBHausnummer extends mfBaseModel {
       $this->log->debug(__METHOD__.": Want new Hausnummer (".$this->id.") Status ".$new_status_code);
 
       $new_status = ADBStatusModel::getFirst(["code" => $new_status_code]);
-      if(!$new_status) return false;
+
+      if(!$new_status) {
+          // try flag
+          $flag = ADBStatusflagModel::getFirst(["code" => $new_status_code]);
+          if(!$flag) return false;
+
+          $this->log->debug(__METHOD__.": Statuscode $new_status_code is Flag");
+          $flag_value = ADBHausnummerStatusflagValueModel::getFirst(["flag_id" => $flag->id, "hausnummer_id" => $this->id]);
+          if(!$flag_value) {
+              $flag_value = ADBHausnummerStatusflagValueModel::create([
+                  "hausnummer_id" => $this->id,
+                  "flag_id" => $flag->id
+              ]);
+          }
+          $flag_value->value = 1;
+          $flag_value->save();
+          return true;
+      }
 
       $old_status = $this->getProperty("status");
       if($old_status->code < $new_status->code) {

application/AddressDB/AddressDB.php

@@ -167,6 +167,8 @@ class AddressDB {
 
             }
 
+
+
             break;
         }
         return true;

application/Mailtemplate/Mailtemplate.php

@@ -0,0 +1,46 @@
+<?php
+
+class Mailtemplate extends mfBaseModel {
+    private $creator;
+    private $editor;
+
+
+    public function getProperty($name) {
+        if($this->$name == null) {
+
+            if($name == "creator") {
+                $user = mfValuecache::singleton()->get("Worker-id-".$this->create_by);
+                if($user) {
+                    $this->creator = $user;
+                    return $this->creator;
+                }
+                $this->creator = new User($this->create_by);
+                if($this->creator->id) {
+                    mfValuecache::singleton()->set("Worker-id-".$this->create_by, $this->creator);
+                }
+                return $this->creator;
+            }
+
+            if($name == "editor") {
+                $this->editor = new User($this->edit_by);
+                return $this->editor;
+            }
+
+            $classname = ucfirst($name);
+            $idfield = $name."_id";
+            $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-".$this->$idfield);
+            if(!$this->$name) {
+                $this->$name = new $classname($this->$idfield);
+            }
+
+            if($this->$name->id) {
+                mfValuecache::singleton()->set("mfObjectmodel-$name-".$this->$name->id, $this->$name);
+                return $this->$name;
+            } else {
+                return null;
+            }
+        }
+
+        return $this->$name;
+    }
+}

application/Mailtemplate/MailtemplateController.php

@@ -0,0 +1,105 @@
+<?php
+
+class MailtemplateController extends mfBaseController {
+
+    protected function init() {
+        $this->needlogin=true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me",$me);
+
+        if(!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction() {
+        if($this->request->resetFilter) {
+            unset($_SESSION[MFAPPNAME.'-Mailtemplate-filter']);
+        }
+
+        $filter = [];
+        if(is_array($this->request->filter)) {
+            $filter = $this->request->filter;
+            $_SESSION[MFAPPNAME.'-Mailtemplate-filter'] = $filter;
+        } else {
+            if(array_key_exists(MFAPPNAME.'-Mailtemplate-filter', $_SESSION) && count($_SESSION[MFAPPNAME.'-Mailtemplate-filter'])) {
+                $filter = $_SESSION[MFAPPNAME.'-Mailtemplate-filter'];
+            }
+        }
+
+        $this->layout->set("filter", $filter);
+        $filter = $this->getPreparedFilter($filter);
+
+
+        // pagination defaults
+        $pagination = [];
+        $pagination['start'] = 0;
+        $pagination['count'] = 20;
+        $pagination['maxItems'] = 0;
+
+        if(is_numeric($this->request->s)) {
+            $pagination['start'] = intval($this->request->s);
+        }
+
+        $pagination['maxItems'] = MailtemplateModel::count($filter);
+        $this->layout()->set("pagination", $pagination);
+
+        $templates = MailtemplateModel::search($filter, $pagination);
+        $this->layout()->set("templates", $templates);
+    }
+
+    private function getPreparedFilter($filter) {
+        $new_filter = [];
+
+        foreach($filter as $name => $value) {
+            $new_filter[$name] = $value;
+        }
+
+        return $new_filter;
+    }
+
+    protected function addAction() {
+        $this->layout()->setTemplate("Mailtemplate/Form");
+
+    }
+
+    protected function editAction() {
+        $id = $this->request->id;
+        $template = new Mailtemplate($id);
+        if(!$template->id) {
+            $this->layout()->setFlash("Emailtemplate nicht gefunden.", "error");
+            $this->redirect("Mailtemplate");
+        }
+
+        $this->layout()->set("template", $template);
+
+        return $this->addAction();
+    }
+
+    protected function saveAction() {
+        $r = $this->request;
+        var_dump($r->get());exit;
+        $id = $r->id;
+
+        if(is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $template = new Mailtemplate($id);
+            if(!$template->id) {
+                $this->layout()->setFlash("Emailtemplate nicht gefunden", "error");
+                $this->redirect("Mailtemplate");
+            }
+        } else {
+            $mode = "add";
+        }
+
+        $data = [];
+        $data["name"] = $r->name;
+        $data["subject"] = $r->subject;
+        //$data[""] = $r->;
+        //$data[""] = $r->;
+        //$data[""] = $r->;
+
+    }
+}

application/Mailtemplate/MailtemplateModel.php

@@ -0,0 +1,139 @@
+<?php
+
+class MailtemplateModel {
+    public $name;
+    public $subject;
+    public $body;
+
+    public $note = null;
+    public $create_by = null;
+    public $edit_by = null;
+    public $create = null;
+    public $edit = null;
+
+
+    public static function create(Array $data) {
+        $model = new Mailtemplate();
+
+        foreach($data as $field => $value) {
+            if(property_exists(get_called_class(), $field)) {
+                $model ->$field = $value;
+            }
+        }
+
+        $me = new User();
+        $me->loadMe();
+
+        if($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getAll() {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("Mailtemplate", "*", "1 = 1 ORDER BY name");
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Mailtemplate($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst($filter = []) {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("Mailtemplate", "*", "$where ORDER BY name LIMIT 1");
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new Mailtemplate($data);
+            if($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function count($filter) {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $sql = "SELECT COUNT(*) as cnt FROM `Mailtemplate`
+            WHERE $where
+           ";
+
+        mfLoghandler::singleton()->debug($sql);
+        $res = $db->query($sql);
+        if($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            return $data->cnt;
+        }
+        return 0;
+    }
+
+    public static function search($filter, $limit=false) {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+
+        $sql = "SELECT Mailtemplate.* FROM `Mailtemplate`
+                WHERE $where
+                ORDER BY name
+      ";
+
+        mfLoghandler::singleton()->debug($sql);
+        if(is_array($limit) && count($limit)) {
+            if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
+                $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
+            } elseif(is_numeric($limit['count'])) {
+                $sql .= " LIMIT ".$limit['count'];
+            }
+        }
+
+        $res = $db->query($sql);
+        if($db->num_rows($res)) {
+            while($data = $db->fetch_object($res)) {
+                $items[] = new Mailtemplate($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter) {
+        $where = "1=1 ";
+
+        $db = FronkDB::singleton();
+
+        //var_dump($filter);exit;
+        if(array_key_exists("name", $filter)) {
+            $name = $db->escape($filter['name']);
+            if($name) {
+                $where .= " AND Mailtemplate.`name` = '$name'";
+            }
+        }
+
+        if(array_key_exists("subject", $filter)) {
+            $subject = $db->escape($filter['subject']);
+            if($subject) {
+                $where .= " AND Mailtemplate.`subject` = '$subject'";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+
+}