ContractConfig ausgebaut

application/ContractconfigGroup/ContractconfigGroupModel.php

@@ -73,7 +73,14 @@ class ContractconfigGroupModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("ContractconfigGroup", "*", "$where ORDER BY name, filename");
+    $sql = "SELECT ContractconfigGroup.* FROM ContractconfigGroup
+            LEFT JOIN ContractconfiggroupProducttech ON (ContractconfigGroup.id = ContractconfiggroupProducttech.contractconfiggroup_id)
+            WHERE $where
+            ORDER BY ContractconfigGroup.id, producttech_id, `create`
+      ";
+    mfLoghandler::singleton()->debug($sql);
+    $res = $db->query($sql);
+    //$res = $db->select("ContractconfigGroup", "*", "$where ORDER BY name, `create`");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new ContractconfigGroup($data);
@@ -89,17 +96,20 @@ class ContractconfigGroupModel {
     if(array_key_exists("name", $filter)) {
       $name = FronkDB::singleton()->escape($filter['name']);
       if($name) {
-        $where .= " AND name='$name'";
+        $where .= " AND ContractconfigGroup.name='$name'";
       }
     }
     
-    if(array_key_exists("filename", $filter)) {
-      $filename = FronkDB::singleton()->escape($filter['filename']);
-      if($filename) {
-        $where .= " AND filename='$filename'";
+    if(array_key_exists("producttech_id", $filter)) {
+      $producttech_id = $filter['producttech_id'];
+      if(is_numeric($producttech_id)) {
+        $where .= " AND producttech_id=$producttech_id";
+      } elseif(is_array($producttech_id) && count($producttech_id)) {
+        $where .= " AND producttech_id IN (". implode(",", $producttech_id).")";
       }
     }
     
+    
     if(array_key_exists("subfolder", $filter)) {
       $subfolder = FronkDB::singleton()->escape($filter['subfolder']);
       if($subfolder) {