From 80bb356d16f254db1413f5077d22014318643421 Mon Sep 17 00:00:00 2001
From: "alextselegidis@gmail.com"
 <alextselegidis@gmail.com@9c3f3e9a-ba09-77dc-566e-c2017f8391d2>
Date: Thu, 21 Nov 2013 21:58:51 +0000
Subject: [PATCH] * Fixed Issue #25 * Other minor bug fixes.

---
 src/application/controllers/appointments.php  |  5 ++-
 src/application/controllers/backend_api.php   |  2 ++
 src/application/models/appointments_model.php | 15 ++++++++
 src/application/views/backend/customers.php   | 12 +++----
 src/application/views/backend/services.php    | 24 ++++++-------
 src/application/views/backend/users.php       | 36 ++++++++-----------
 src/assets/js/backend_calendar.js             | 16 ++++-----
 src/assets/js/backend_users_providers.js      |  1 +
 src/assets/js/frontend_book.js                |  6 +++-
 9 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/src/application/controllers/appointments.php b/src/application/controllers/appointments.php
index a7ed1e32..e59d6395 100644
--- a/src/application/controllers/appointments.php
+++ b/src/application/controllers/appointments.php
@@ -409,8 +409,11 @@ class Appointments extends CI_Controller {
             
             $service_duration = $this->services_model->get_value('duration', $_POST['id_services']);
             
+            $exclude_appointments = (isset($_POST['exclude_appointment_id'])) 
+                    ? array($_POST['exclude_appointment_id']) : array();            
+            
             $available_periods = $this->get_provider_available_time_periods(
-                    $_POST['id_users_provider'], $_POST['start_datetime']);
+                    $_POST['id_users_provider'], $_POST['start_datetime'], $exclude_appointments);
 
             $is_still_available = FALSE;
 
diff --git a/src/application/controllers/backend_api.php b/src/application/controllers/backend_api.php
index 44361d07..95084a7d 100644
--- a/src/application/controllers/backend_api.php
+++ b/src/application/controllers/backend_api.php
@@ -342,8 +342,10 @@ class Backend_api extends CI_Controller {
             }
             
             $this->load->model('providers_model');
+            $this->load->model('appointments_model');
             $this->providers_model->set_setting('google_sync', FALSE, $_POST['provider_id']);
             $this->providers_model->set_setting('google_token', NULL, $_POST['provider_id']);
+            $this->appointments_model->clear_google_sync_ids($_POST['provider_id']);
             
             echo json_encode(AJAX_SUCCESS);
             
diff --git a/src/application/models/appointments_model.php b/src/application/models/appointments_model.php
index 98f14837..adee7318 100644
--- a/src/application/models/appointments_model.php
+++ b/src/application/models/appointments_model.php
@@ -369,6 +369,21 @@ class Appointments_Model extends CI_Model {
         $this->db->where('id', $unavailable_id);
         return $this->db->delete('ea_appointments');
     }
+    
+    /**
+     * Clear google sync IDs from appointment record.
+     * 
+     * @param numeric $provider_id The appointment provider record id.
+     */
+    public function clear_google_sync_ids($provider_id) {
+        if (!is_numeric($provider_id)) {
+            throw new Exception('Invalid argument type $provider_id (value: "' 
+                    . $provider_id . '")');
+        }
+        
+        $this->db->update('ea_appointments', array('id_google_calendar' => NULL), 
+                array('id_users_provider' => $provider_id));
+    }
 }
 
 /* End of file appointments_model.php */
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 2d8912b2..55e13610 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -26,14 +26,12 @@
 <div id="customers-page" class="row-fluid">
 	<div id="filter-customers" class="filter-records column span4">
 		<form class="input-append">
-			<input class="key span7" type="text" />
-            <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+			<input class="key span12" type="text" />
+            <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
 		</form>
         
diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index d3b58661..bc5d845c 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -36,14 +36,12 @@
         <?php // FILTER SERVICES ?>
         <div id="filter-services" class="filter-records column span4">
             <form class="input-append">
-                <input class="key span7" type="text" />
-                <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+                <input class="key span12" type="text" />
+                <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
             </form>
             
@@ -113,14 +111,12 @@
     <div id="categories" class="tab-content" style="display:none;">
         <div id="filter-categories" class="filter-records column span4">
             <form class="input-append">
-                <input class="key span7" type="text" class="" />
-                <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+                <input class="key span12" type="text" />
+                <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
             </form>
 
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index e811a9d0..4ff1bb85 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -62,14 +62,12 @@
     <div id="admins" class="tab-content">
         <div id="filter-admins" class="filter-records column span4">
             <form class="input-append">
-                <input class="key span7" type="text" />
-                <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+                <input class="key span12" type="text" />
+                <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
             </form>
             
@@ -170,14 +168,12 @@
     <div id="providers" class="tab-content" style="display:none;">
         <div id="filter-providers" class="filter-records column span4">
             <form class="input-append">
-                <input class="key span7" type="text" />
-                <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+                <input class="key span12" type="text" />
+                <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
             </form>
             
@@ -378,14 +374,12 @@
     <div id="secretaries" class="tab-content" style="display:none;">
         <div id="filter-secretaries" class="filter-records column span4">
             <form class="input-append">
-                <input class="key span7" type="text" />
-                <button class="filter btn" type="submit">
-                    <i class="icon-filter"></i>
-                    Filter
+                <input class="key span12" type="text" />
+                <button class="filter btn" type="submit" title="Filter">
+                    <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button">
-                    <i class="icon-remove-circle"></i>
-                    Clear
+                <button class="clear btn" type="button" title="Clear">
+                    <i class="icon-repeat"></i>
                 </button>
             </form>
             
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index 12ffc3e8..ae6acd08 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -31,6 +31,7 @@ var BackendCalendar = {
             'slotMinutes': 30,
             'axisFormat': 'HH:mm',
             'timeFormat': 'HH:mm{ - HH:mm}',
+            'allDayText': 'All Day', 
             'columnFormat': {
                 'month': 'ddd',
                 'week': 'ddd d/M',
@@ -55,7 +56,7 @@ var BackendCalendar = {
             'eventDrop': BackendCalendar.calendarEventDrop,
             'eventAfterAllRender': function(view) {
                 BackendCalendar.convertTitlesToHtml();
-            }
+            }   
         });
         
         // Temporary fix: make the first letter capital in all the lowercase strings
@@ -64,7 +65,6 @@ var BackendCalendar = {
         $('#calendar .fc-button-agendaDay').text('Day');
         $('#calendar .fc-button-agendaWeek').text('Week');
         $('#calendar .fc-button-month').text('Month');
-        $('#calendar .fc-agenda-allday .fc-agenda-axis').text('All Day');
         
         // Trigger once to set the proper footer position after calendar 
         // initialization.
@@ -1318,8 +1318,7 @@ var BackendCalendar = {
      */
     calendarWindowResize: function(view) {
         $('#calendar').fullCalendar('option', 'height', 
-                BackendCalendar.getCalendarHeight());
-        //BackendCalendar.convertTitlesToHtml();        
+                BackendCalendar.getCalendarHeight());      
     },
     
     /**
@@ -1612,10 +1611,7 @@ var BackendCalendar = {
                 $('#calendar').fullCalendar('getView').visStart,
                 $('#calendar').fullCalendar('getView').visEnd);
         $(window).trigger('resize'); // Places the footer on the bottom.
-        
-        // Change string from "all-day" to "All Day".
-        $('#calendar .fc-agenda-allday .fc-agenda-axis').text('All Day');
-        
+                
         // Remove all open popovers.
         $('.close-popover').each(function() {
             $(this).parents().eq(2).remove();
@@ -1787,7 +1783,7 @@ var BackendCalendar = {
      * On some calendar events the titles contain html markup that is not 
      * displayed properly due to the fullcalendar plugin. This plugin sets
      * the .fc-event-title value by using the $.text() method and not the 
-     * $.html() method. So in order for the title to display the html properly
+     * $.html() method. So in order for the title to displya the html properly
      * we convert all the .fc-event-titles where needed into html.
      */
     convertTitlesToHtml: function() {
@@ -1795,6 +1791,8 @@ var BackendCalendar = {
         $('.fc-custom').each(function() {
             var title = $(this).find('.fc-event-title').text();
             $(this).find('.fc-event-title').html(title);
+            var time = $(this).find('.fc-event-time').text();
+            $(this).find('.fc-event-time').html(time);
         });
     }
 };
\ No newline at end of file
diff --git a/src/assets/js/backend_users_providers.js b/src/assets/js/backend_users_providers.js
index ea22cfc5..a2100d24 100644
--- a/src/assets/js/backend_users_providers.js
+++ b/src/assets/js/backend_users_providers.js
@@ -203,6 +203,7 @@ ProvidersHelper.prototype.bindEventHandlers = function() {
      */
     $('#reset-working-plan').click(function() {
         $('.breaks').empty();
+        $('.work-start, .work-end').val('');
         BackendUsers.wp.setup(GlobalVariables.workingPlan);
         BackendUsers.wp.timepickers(false);
     });
diff --git a/src/assets/js/frontend_book.js b/src/assets/js/frontend_book.js
index 27ff8129..7309410e 100644
--- a/src/assets/js/frontend_book.js
+++ b/src/assets/js/frontend_book.js
@@ -234,9 +234,13 @@ var FrontendBook = {
             var postData = {
                 'id_users_provider': formData['appointment']['id_users_provider'],
                 'id_services': formData['appointment']['id_services'],
-                'start_datetime': formData['appointment']['start_datetime']
+                'start_datetime': formData['appointment']['start_datetime'],
             };
             
+            if (GlobalVariables.manageMode) {
+                postData.exclude_appointment_id = GlobalVariables.appointmentData.id;
+            }
+            
             var postUrl = GlobalVariables.baseUrl + 'appointments/ajax_check_datetime_availability';
             
             $.post(postUrl, postData, function(response) {