[Fmsystem-commits] [15854] more on integration

[sigurdne]

Revision: 15854
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15854
Author:   sigurdne
Date:     2016-10-19 11:39:12 +0000 (Wed, 19 Oct 2016)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.bolookup.inc.php
    trunk/property/inc/class.uilookup.inc.php
    trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php

Modified: trunk/property/inc/class.bolookup.inc.php
===================================================================
--- trunk/property/inc/class.bolookup.inc.php   2016-10-18 14:44:33 UTC (rev 
15853)
+++ trunk/property/inc/class.bolookup.inc.php   2016-10-19 11:39:12 UTC (rev 
15854)
@@ -261,6 +261,7 @@
                                        }
                                }
                        }
+                       $filter['active'] = 1;
                        $data['filter'] = $filter;
 
                        $values = $sogeneric->read($data);

Modified: trunk/property/inc/class.uilookup.inc.php
===================================================================
--- trunk/property/inc/class.uilookup.inc.php   2016-10-18 14:44:33 UTC (rev 
15853)
+++ trunk/property/inc/class.uilookup.inc.php   2016-10-19 11:39:12 UTC (rev 
15854)
@@ -431,7 +431,7 @@
                                        'sort' => $order[0]['dir'],
                                        'dir' => $order[0]['dir'],
                                        'allrows' => phpgw::get_var('length', 
'int') == -1,
-                                       'filter' => ''
+                                       'filter' => array()
                                );
 
                                $values = $this->bo->read_vendor($params);

Modified: 
trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
--- trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php   
2016-10-18 14:44:33 UTC (rev 15853)
+++ trunk/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php   
2016-10-19 11:39:12 UTC (rev 15854)
@@ -58,11 +58,11 @@
                         * prosjekt
                         * tjeneste
                         */
-       //              $fellesdata->update_vendor();
+                       $fellesdata->update_vendor();
        //              $fellesdata->update_agresso_prosjekt(); //for mange 
treff
        //              $fellesdata->update_art();                              
//for mange treff
        //              $fellesdata->update_tjeneste();
-                       $fellesdata->update_dimb(); // ansvar
+       //              $fellesdata->update_dimb(); // ansvar, or mange treff
                        $fellesdata->get_org_unit_ids_from_top();
 
 
@@ -397,6 +397,8 @@
 
                function update_tjeneste()
                {
+                       //det er for mange...
+                       return;
                        //curl -s -u portico:BgPor790gfol 
http://tjenester.usrv.ubergenkom.no/api/agresso/tjeneste?id=88010
                        //fm_eco_service
 
@@ -453,7 +455,7 @@
                                  status character varying(1),
                                  navn character varying(255),
                                  adresse character varying(255),
-                                 postnummer character varying(10),
+                                 postnummer character varying(50),
                                  sted character varying(50),
                                  organisasjonsnr character varying(50),
                                  bankkontonr character varying(50),
@@ -469,7 +471,8 @@
                        //fm_vendor
 
                        $url = 
'http://tjenester.usrv.ubergenkom.no/api/agresso/leverandorer?leverandorNr=**';
-                       $url = 
'http://tjenester.usrv.ubergenkom.no/api/agresso/leverandorer?leverandorNr=100304';
+//                     $url = 
'http://tjenester.usrv.ubergenkom.no/api/agresso/leverandorer?leverandorNr=100304';
+                       $error = false;
 
                        $values = array();
                        try
@@ -479,15 +482,33 @@
                        }
                        catch (Exception $exc)
                        {
+                               $error = true;
                                echo $exc->getTraceAsString();
                        }
-                       _debug_array($values);die();
+
                        $sql = 'INSERT INTO fm_vendor_temp (id, status, navn, 
adresse, postnummer, sted, organisasjonsnr, bankkontonr, aktiv)'
                                . ' VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)';
-                       $valueset = array();
 
+                       //remove duplicates
+
+                       if(empty($values[0]['leverandornummer']))
+                       {
+                               _debug_array($values);
+                               $error = true;
+                       }
+                       $vendors = array();
                        foreach ($values as $entry)
                        {
+                               $vendors[$entry['leverandornummer']] = $entry;
+                       }
+
+                       unset($entry);
+//                     _debug_array($vendors);die();
+
+                       $valueset = array();
+
+                       foreach ($vendors as $key => $entry)
+                       {
                                $valueset[] = array
                                        (
                                        1 => array
@@ -538,7 +559,10 @@
                                );
                        }
 
-                       $GLOBALS['phpgw']->db->insert($sql, $valueset, 
__LINE__, __FILE__);
+                       if($valueset && !$error)
+                       {
+                               $GLOBALS['phpgw']->db->insert($sql, $valueset, 
__LINE__, __FILE__);
+                       }
 
 /*
             [leverandornummer] => 9906
@@ -551,7 +575,7 @@
             [bankkontoNr] => 52020801786
             [aktiv] => 1
 */
-                       _debug_array($values);die();
+//                     _debug_array($valueset);die();
 
 
                        $sql = "SELECT fm_vendor_temp.*"
@@ -602,19 +626,21 @@
                                        10 => array(
                                                'value' => 
$GLOBALS['phpgw']->db->f('bankkontonr'),
                                                'type' => PDO::PARAM_STR
-                                       ),
-                                       10 => array(
-                                               'value' => time(),
-                                               'type' => PDO::PARAM_INT
                                        )
                                );
                        }
-                       $sql = 'INSERT INTO fm_vendor (id, org_name,category, 
owner_id, active, adresse, postnr, poststed, org_nr, konto_nr,entry_date)'
-                               . ' VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+                       $sql = 'INSERT INTO fm_vendor (id, org_name,category, 
owner_id, active, adresse, postnr, poststed, org_nr, konto_nr)'
+                               . ' VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
                        if($vendors)
                        {
                                $GLOBALS['phpgw']->db->insert($sql, $vendors, 
__LINE__, __FILE__);
                        }
+
+                       $GLOBALS['phpgw']->db->query("UPDATE fm_vendor SET 
active = 0", __LINE__, __FILE__);
+
+                       $GLOBALS['phpgw']->db->query("UPDATE fm_vendor SET 
active = 1"
+                               . " FROM fm_vendor_temp WHERE fm_vendor.id = 
fm_vendor_temp.id", __LINE__, __FILE__);
+
                }
 
                public function check_external_register($url)