[Fmsystem-commits] [16434] more on eventplanner

[sigurdne]

Revision: 16434
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16434
Author:   sigurdne
Date:     2017-03-14 10:07:16 -0400 (Tue, 14 Mar 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.bobooking.inc.php
    trunk/eventplanner/inc/class.uibooking.inc.php
    trunk/eventplanner/inc/model/class.application.inc.php
    trunk/eventplanner/inc/model/class.booking.inc.php
    trunk/eventplanner/js/portico/application.edit.js
    trunk/eventplanner/setup/phpgw_no.lang

Modified: trunk/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bobooking.inc.php      2017-03-14 07:39:38 UTC 
(rev 16433)
+++ trunk/eventplanner/inc/class.bobooking.inc.php      2017-03-14 14:07:16 UTC 
(rev 16434)
@@ -180,15 +180,14 @@
                {
                        $booking = 
eventplanner_sobooking::get_instance()->read_single($id, true);
                        $booking->from_ = $from_;
-//                     $application = 
createObject('eventplanner.boapplication')->read_single($entity->application_id);
-//                     $booking->to_ = $booking->from_ + 
((int)$application->timespan * 60);
                        $booking->customer_id = $booking->customer_id ? 
$booking->customer_id : '';//foreigns key
+                       $booking->process_update = true;
 
                        if($booking->validate())
                        {
                                return $booking->store();
                        }
-//                     return 
eventplanner_sobooking::get_instance()->update($booking);
+                       return false;
                }
 
 

Modified: trunk/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uibooking.inc.php      2017-03-14 07:39:38 UTC 
(rev 16433)
+++ trunk/eventplanner/inc/class.uibooking.inc.php      2017-03-14 14:07:16 UTC 
(rev 16434)
@@ -385,11 +385,12 @@
                        }
                        else
                        {
+                               $messages = phpgwapi_cache::message_get(true);
                                return array
                                (
                                        'status_kode' => 'error',
                                        'status' => lang('error'),
-                                       'msg' => lang('messages_form_error')
+                                       'msg' => $messages ? $messages : 
lang('did not validate')
                                );
                        }
 

Modified: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php      2017-03-14 
07:39:38 UTC (rev 16433)
+++ trunk/eventplanner/inc/model/class.application.inc.php      2017-03-14 
14:07:16 UTC (rev 16434)
@@ -416,6 +416,13 @@
                 */
                protected function preValidate( &$entity )
                {
+
+                       if($entity->date_start && $entity->date_start >  
$entity->date_end)
+                       {
+                               $entity->date_end = $entity->date_start;
+                               phpgwapi_cache::message_set(lang('End date 
cannot be before start date'), 'error');
+                       }
+
                        if (!empty($entity->comment))
                        {
                                $entity->comment_input = array(

Modified: trunk/eventplanner/inc/model/class.booking.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.booking.inc.php  2017-03-14 07:39:38 UTC 
(rev 16433)
+++ trunk/eventplanner/inc/model/class.booking.inc.php  2017-03-14 14:07:16 UTC 
(rev 16434)
@@ -60,7 +60,8 @@
                        $comments,
                        $comment,
                        $created,
-                       $secret;
+                       $secret,
+                       $process_update;
 
                protected $field_of_responsibility_name = '.booking';
 
@@ -301,8 +302,22 @@
 
                        $bookings =  
eventplanner_sobooking::get_instance()->read($params);
 
-                       if($entity->customer_id) // update
+                       foreach ($bookings['results'] as $booking)
                        {
+                               if($booking['id'] == $entity->get_id())
+                               {
+                                       continue;
+                               }
+
+                               if(($entity->from_ > $booking['from_'] && 
$entity->from_ < $booking['to_'])
+                                       ||      ($entity->to_ > 
$booking['from_'] && $entity->to_ < $booking['to_']) )
+                               {
+                                       $errors['from_'] = lang('Time is 
already booked');
+                               }
+                       }
+
+                       if($entity->customer_id || $entity->process_update) // 
update
+                       {
                                $test_total_tecords = 
(int)$bookings['total_records'];
                        }
                        else // new entry

Modified: trunk/eventplanner/js/portico/application.edit.js
===================================================================
--- trunk/eventplanner/js/portico/application.edit.js   2017-03-14 07:39:38 UTC 
(rev 16433)
+++ trunk/eventplanner/js/portico/application.edit.js   2017-03-14 14:07:16 UTC 
(rev 16434)
@@ -334,12 +334,21 @@
                        {
                                $("#from_").val('');
                                htmlString += "<div class=\"msg_good\">";
+                               htmlString += result.msg;
                        }
                        else
                        {
                                htmlString += "<div class=\"error\">";
+                               var msg = result.msg;
+                               if (typeof (msg) == 'object')
+                               {
+                                       htmlString += msg['error'][0]['msg'];
+                               }
+                               else
+                               {
+                                       htmlString += result.msg;
+                               }
                        }
-                       htmlString += result.msg;
                        htmlString += '</div>';
                        $("#receipt").html(htmlString);
 

Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang      2017-03-14 07:39:38 UTC (rev 
16433)
+++ trunk/eventplanner/setup/phpgw_no.lang      2017-03-14 14:07:16 UTC (rev 
16434)
@@ -112,4 +112,6 @@
 permission     eventplanner    no      Rettighet
 maximum number of events       eventplanner    no      Maksimum antall 
arrangement
 number of users        eventplanner    no      Ca. antall brukere
-disconnect     eventplanner    no      Kople fra
\ No newline at end of file
+disconnect     eventplanner    no      Kople fra
+end date cannot be before start date   eventplanner    no      Siste dato kan 
ikke være før første dato
+Time is already booked eventplanner    no      Tiden er allerede booking
\ No newline at end of file