Added forms for Contractconfig

application/ContractconfigGroup/ContractconfigGroupModel.php

@@ -2,11 +2,6 @@
 
 class ContractconfigGroupModel {
   public $name;
-  public $description;
-  public $filename;
-  public $store_filename;
-  public $orig_filename;
-  public $subfolder;
   
   public $create_by = null;
   public $edit_by = null;
@@ -51,11 +46,11 @@ class ContractconfigGroupModel {
     
   }
   
-  public static function getFirst() {
+  public static function getFirst($filter = []) {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("ContractconfigGroup", "*", "$where LIMIT 1");
+    $res = $db->select("ContractconfigGroup", "*", "$where ORDER BY name, `create` LIMIT 1");
     if($db->num_rows($res)) {
       $data = $db->fetch_object($res);
       $item = new ContractconfigGroup($data);
@@ -74,9 +69,11 @@ class ContractconfigGroupModel {
     
     $where = self::getSqlFilter($filter);
     $sql = "SELECT ContractconfigGroup.* FROM ContractconfigGroup
-            LEFT JOIN ContractconfiggroupProducttech ON (ContractconfigGroup.id = ContractconfiggroupProducttech.contractconfiggroup_id)
+            LEFT JOIN ContractconfiggroupProductgroup ON (ContractconfigGroup.id = ContractconfiggroupProductgroup.contractconfiggroup_id)
+            LEFT JOIN Productgroup ON (ContractconfiggroupProductgroup.productgroup_id = Productgroup.id)
             WHERE $where
-            ORDER BY ContractconfigGroup.id, producttech_id, `create`
+            GROUP BY ContractconfigGroup.id
+            ORDER BY ContractconfigGroup.name, ContractconfigGroup.`create`
       ";
     mfLoghandler::singleton()->debug($sql);
     $res = $db->query($sql);
@@ -109,6 +106,14 @@ class ContractconfigGroupModel {
       }
     }
     
+    if(array_key_exists("productgroup_id", $filter)) {
+      $productgroup_id = $filter['productgroup_id'];
+      if(is_numeric($productgroup_id)) {
+        $where .= " AND productgroup_id=$productgroup_id";
+      } elseif(is_array($productgroup_id) && count($productgroup_id)) {
+        $where .= " AND productgroup_id IN (". implode(",", $productgroup_id).")";
+      }
+    }
     
     if(array_key_exists("subfolder", $filter)) {
       $subfolder = FronkDB::singleton()->escape($filter['subfolder']);