[Fmsystem-commits] [16689] more on eventplanner

[sigurdne]

Revision: 16689
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16689
Author:   sigurdne
Date:     2017-05-04 14:42:35 -0400 (Thu, 04 May 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.sovendor.inc.php
    trunk/eventplanner/inc/model/class.vendor.inc.php
    trunk/eventplanner/setup/phpgw_no.lang

Modified: trunk/eventplanner/inc/class.sovendor.inc.php
===================================================================
--- trunk/eventplanner/inc/class.sovendor.inc.php       2017-05-04 13:51:23 UTC 
(rev 16688)
+++ trunk/eventplanner/inc/class.sovendor.inc.php       2017-05-04 18:42:35 UTC 
(rev 16689)
@@ -115,4 +115,17 @@
                        return  $this->db->transaction_commit();
                }
 
+               function check_duplicate_organization($organization_number = 
false)
+               {
+                       if(!$organization_number)
+                       {
+                               return false;
+                       }
+
+                       $query = $this->db->db_addslashes($organization_number);
+                       $sql = "SELECT name FROM eventplanner_vendor WHERE 
organization_number = '{$query}'";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       $this->db->next_record();       
+                       return $this->db->f('name', true);
+               }
        }
\ No newline at end of file

Modified: trunk/eventplanner/inc/model/class.vendor.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.vendor.inc.php   2017-05-04 13:51:23 UTC 
(rev 16688)
+++ trunk/eventplanner/inc/model/class.vendor.inc.php   2017-05-04 18:42:35 UTC 
(rev 16689)
@@ -264,6 +264,16 @@
                        }
                }
 
+               protected function doValidate( $entity, &$errors )
+               {
+                       $organization_number = $entity->organization_number;
+                       $duplicate_name = 
eventplanner_sovendor::get_instance()->check_duplicate_organization($organization_number);
+                       if ($duplicate_name)
+                       {
+                               $errors['organization_number'] = 
lang('organization number already exists for %1', $duplicate_name);
+                       }
+               }
+
                protected function generate_secret( $length = 10 )
                {
                        return substr(base64_encode(rand(1000000000, 
9999999999)), 0, $length);

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-05-04 13:51:23 UTC (rev 
16688)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-05-04 18:42:35 UTC (rev 
16689)
@@ -121,4 +121,5 @@
 days   eventplanner    no      dager
 hours  eventplanner    no      Timer
 there is a minimum interval of %1 hours        eventplanner    no      Det er 
et minimumsintervall på %1 time(r)
-summary        eventplanner    no      kortversjon programbeskrivelse
\ No newline at end of file
+summary        eventplanner    no      kortversjon programbeskrivelse
+organization number already exists for %1      eventplanner    no      
Organisasjonsnummeret er allerede registrert på %1.
\ No newline at end of file