DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 5e8c7b5..54caf2f 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Table Definition for core company
+ * Table Definition for core enum - it's used in pulldowns or simple option lists.
  */
 require_once 'DB/DataObject.php';
 
@@ -57,6 +57,16 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     core_enum.display_name LIKE '%{$name}%'
             ");
         }
+        if(!empty($q['query']['search_begins'])) {
+            $name = $this->escape($q['query']['search_begins']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                    core_enum.name LIKE '{$name}%'
+                OR
+                    core_enum.display_name LIKE '{$name}%'
+            ");
+        }
+        
         if (isset($q['_etypes'])) {
             $this->whereAddIn('core_enum.etype', explode(',', $q['_etypes']), 'string');
         }
@@ -148,16 +158,48 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $tn = $this->tableName();
         $x = $this->factory($tn);
         
-        if(empty($req['etype'])){
+        if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+            
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name or etype missing');
+            }
+            
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
-        }else{
-            $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
+        } else if (!empty($req['_bulk_names'])) {
             
+            $lines = explode("\n", $req['_bulk_names']);
+            foreach($lines as $l) {
+                $l = trim($l);
+                if (!strlen($l)) {
+                    continue;
+                }
+                $bits = explode(',', $l);
+                $rr = array(
+                    'etype' => $req['etype'],
+                    'name' => array_shift($bits)
+                );
+                
+                $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
+                
+                $x = $this->factory($tn);
+                $x->beforeInsert($rr, $roo);
+                $x->setFrom($rr);
+                $x->insert();
+                
+            }
+            $roo->jok("inserted");
+            
+        } else {
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name missing');
+            }
+            
+            $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
+            $x->find(true);
             if($x->count() > 0){
-                print_R($x->fetchAll());exit;
-                $roo->jerr('is exsiting');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         }
     }
@@ -169,7 +211,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
          
     }
     
-    function onUpdate($old, $req)
+    function onUpdate($old, $req, $roo)
     {
         $x = $this->factory($this->tableName());
         $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')"); // no idea why need to do this!!??
@@ -312,6 +354,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $t->etype = isset($base['etype']) ? $base['etype'] : $t->etype ;
             
             $t->name = isset($row['name']) ? $row['name'] : '';
+            $t->display_name = isset($row['display_name']) ? $row['display_name'] : '';
             
             if (empty($t->name)) {
                 print_R($data);