From 89725e75c05d921b7efbb35132218921d033719b Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Mon, 18 Jul 2016 23:46:15 +0200
Subject: [PATCH] Added calendar-view setting in the UI (#182).

---
 src/application/models/Admins_model.php      |  2 +-
 src/application/models/Providers_model.php   |  2 +-
 src/application/models/Secretaries_model.php |  2 +-
 src/application/views/backend/settings.php   |  8 +++++++
 src/application/views/backend/users.php      | 24 ++++++++++++++++++++
 src/assets/js/backend_settings.js            |  1 +
 src/assets/js/backend_settings_user.js       |  3 ++-
 src/assets/js/backend_users_admins.js        |  7 +++++-
 src/assets/js/backend_users_providers.js     |  7 +++++-
 src/assets/js/backend_users_secretaries.js   |  7 +++++-
 10 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/application/models/Admins_model.php b/src/application/models/Admins_model.php
index 0c371016..c2251b04 100644
--- a/src/application/models/Admins_model.php
+++ b/src/application/models/Admins_model.php
@@ -228,7 +228,7 @@ class Admins_Model extends CI_Model {
 
         // Validate calendar view mode. 
         if (isset($admin['settings']['calendar_view']) && ($admin['settings']['calendar_view'] !== CALENDAR_VIEW_DEFAULT 
-                || $admin['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
+                && $admin['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
              throw new Exception('The calendar view setting must be either "' . CALENDAR_VIEW_DEFAULT 
                     . '" or "' . CALENDAR_VIEW_TABLE . '", given: ' .  $admin['settings']['calendar_view']);
         }
diff --git a/src/application/models/Providers_model.php b/src/application/models/Providers_model.php
index b11271a8..ad32717a 100644
--- a/src/application/models/Providers_model.php
+++ b/src/application/models/Providers_model.php
@@ -260,7 +260,7 @@ class Providers_Model extends CI_Model {
 
         // Validate calendar view mode. 
         if (isset($provider['settings']['calendar_view']) && ($provider['settings']['calendar_view'] !== CALENDAR_VIEW_DEFAULT 
-                || $provider['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
+                && $provider['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
              throw new Exception('The calendar view setting must be either "' . CALENDAR_VIEW_DEFAULT 
                     . '" or "' . CALENDAR_VIEW_TABLE . '", given: ' .  $provider['settings']['calendar_view']);
         }
diff --git a/src/application/models/Secretaries_model.php b/src/application/models/Secretaries_model.php
index 802a9bfd..5f019ab7 100644
--- a/src/application/models/Secretaries_model.php
+++ b/src/application/models/Secretaries_model.php
@@ -226,7 +226,7 @@ class Secretaries_Model extends CI_Model {
 
         // Validate calendar view mode. 
         if (isset($secretary['settings']['calendar_view']) && ($secretary['settings']['calendar_view'] !== CALENDAR_VIEW_DEFAULT 
-                || $secretary['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
+                && $secretary['settings']['calendar_view'] !== CALENDAR_VIEW_TABLE)) {
              throw new Exception('The calendar view setting must be either "' . CALENDAR_VIEW_DEFAULT 
                     . '" or "' . CALENDAR_VIEW_TABLE . '", given: ' .  $secretary['settings']['calendar_view']);
         }
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index da99dd1e..18a16a57 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -415,6 +415,14 @@
                     <input type="password" id="retype-password" class="form-control" />
                 </div>
 
+                <div class="form-group">
+                    <label for="calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                    <select id="calendar-view" class="form-control required">
+                        <option value="default">Default</option>
+                        <option value="table">Table</option>
+                    </select>
+                </div>
+
                 <button type="button" id="user-notifications" class="btn btn-default" data-toggle="button">
                     <span class="glyphicon glyphicon-envelope"></span>
                     <?php echo $this->lang->line('receive_notifications'); ?>
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index fe3f6ffb..2c5c16d2 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -180,6 +180,14 @@
                             <input type="password" id="admin-password-confirm" class="form-control required" />
                         </div>
 
+                        <div class="form-group">
+                            <label for="admin-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                            <select id="admin-calendar-view" class="form-control required">
+                                <option value="default">Default</option>
+                                <option value="table">Table</option>
+                            </select>
+                        </div>
+
                         <br>
 
                         <button type="button" id="admin-notifications" class="btn btn-default" data-toggle="button">
@@ -330,6 +338,14 @@
                                 <input type="password" id="provider-password-confirm" class="form-control required" />
                             </div>
 
+                            <div class="form-group">
+                                <label for="provider-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                                <select id="provider-calendar-view" class="form-control required">
+                                    <option value="default">Default</option>
+                                    <option value="table">Table</option>
+                                </select>
+                            </div>
+
                             <br>
 
                             <button type="button" id="provider-notifications" class="btn btn-default" data-toggle="button">
@@ -595,6 +611,14 @@
                             <input type="password" id="secretary-password-confirm" class="form-control required" />
                         </div>
 
+                        <div class="form-group">
+                            <label for="secretary-calendar-view"><?php echo $this->lang->line('calendar'); ?> *</label>
+                            <select id="secretary-calendar-view" class="form-control required">
+                                <option value="default">Default</option>
+                                <option value="table">Table</option>
+                            </select>
+                        </div>
+
                         <br>
 
                         <button type="button" id="secretary-notifications" class="btn btn-default" data-toggle="button">
diff --git a/src/assets/js/backend_settings.js b/src/assets/js/backend_settings.js
index 98e6c2f7..a97a242d 100644
--- a/src/assets/js/backend_settings.js
+++ b/src/assets/js/backend_settings.js
@@ -94,6 +94,7 @@ window.BackendSettings = window.BackendSettings || {};
 
         $('#username').val(GlobalVariables.settings.user.settings.username);
         $('#password, #retype-password').val('');
+        $('#calendar-view').val(GlobalVariables.settings.user.settings.calendar_view);
 
         if (GlobalVariables.settings.user.settings.notifications == true) {
             $('#user-notifications').addClass('active');
diff --git a/src/assets/js/backend_settings_user.js b/src/assets/js/backend_settings_user.js
index fc7278c7..38921cdc 100644
--- a/src/assets/js/backend_settings_user.js
+++ b/src/assets/js/backend_settings_user.js
@@ -40,7 +40,8 @@
             notes: $('#notes').val(),
             settings: {
                 username: $('#username').val(),
-                notifications: $('#user-notifications').hasClass('active')
+                notifications: $('#user-notifications').hasClass('active'),
+                calendar_view: $('#calendar-view').val()
             }
         };
 
diff --git a/src/assets/js/backend_users_admins.js b/src/assets/js/backend_users_admins.js
index 2ab2a715..fab84cf6 100644
--- a/src/assets/js/backend_users_admins.js
+++ b/src/assets/js/backend_users_admins.js
@@ -85,6 +85,7 @@
             $('#admins .add-edit-delete-group').hide();
             $('#admins .save-cancel-group').show();
             $('#admins .record-details').find('input, textarea').prop('readonly', false);
+            $('#admins .record-details').find('select').prop('disabled', false);
             $('#admin-password, #admin-password-confirm').addClass('required');
             $('#admin-notifications').prop('disabled', false);
             $('#filter-admins button').prop('disabled', true);
@@ -98,6 +99,7 @@
             $('#admins .add-edit-delete-group').hide();
             $('#admins .save-cancel-group').show();
             $('#admins .record-details').find('input, textarea').prop('readonly', false);
+            $('#admins .record-details').find('select').prop('disabled', false);
             $('#admin-password, #admin-password-confirm').removeClass('required');
             $('#admin-notifications').prop('disabled', false);
 
@@ -142,7 +144,8 @@
                 notes: $('#admin-notes').val(),
                 settings: {
                     username: $('#admin-username').val(),
-                    notifications: $('#admin-notifications').hasClass('active')
+                    notifications: $('#admin-notifications').hasClass('active'),
+                    calendar_view: $('#admin-calendar-view').val()
                 }
             };
 
@@ -288,6 +291,7 @@
         $('#admins .add-edit-delete-group').show();
         $('#admins .save-cancel-group').hide();
         $('#admins .record-details').find('input, textarea').prop('readonly', true);
+        $('#admins .record-details').find('select').prop('disabled', true);
         $('#admins .form-message').hide();
         $('#admin-notifications').prop('disabled', true);
         $('#admins .required').css('border', '');
@@ -320,6 +324,7 @@
         $('#admin-notes').val(admin.notes);
 
         $('#admin-username').val(admin.settings.username);
+        $('#admin-calendar-view').val(admin.settings.calendar_view);
         if (admin.settings.notifications == true) {
             $('#admin-notifications').addClass('active');
         } else {
diff --git a/src/assets/js/backend_users_providers.js b/src/assets/js/backend_users_providers.js
index 356da831..a74d2b03 100644
--- a/src/assets/js/backend_users_providers.js
+++ b/src/assets/js/backend_users_providers.js
@@ -89,6 +89,7 @@
             $('#providers .add-edit-delete-group').hide();
             $('#providers .save-cancel-group').show();
             $('#providers .record-details').find('input, textarea').prop('readonly', false);
+            $('#providers .record-details').find('select').prop('disabled', false);
             $('#provider-password, #provider-password-confirm').addClass('required');
             $('#provider-notifications').prop('disabled', false);
             $('#providers').find('.add-break, .edit-break, .delete-break, #reset-working-plan').prop('disabled', false);
@@ -109,6 +110,7 @@
             $('#filter-providers button').prop('disabled', true);
             $('#filter-providers .results').css('color', '#AAA');
             $('#providers .record-details').find('input, textarea').prop('readonly', false);
+            $('#providers .record-details').find('select').prop('disabled', false);
             $('#provider-password, #provider-password-confirm').removeClass('required');
             $('#provider-notifications').prop('disabled', false);
             $('#provider-services input[type="checkbox"]').prop('disabled', false);
@@ -154,7 +156,8 @@
                 settings: {
                     username: $('#provider-username').val(),
                     working_plan: JSON.stringify(BackendUsers.wp.get()),
-                    notifications: $('#provider-notifications').hasClass('active')
+                    notifications: $('#provider-notifications').hasClass('active'),
+                    calendar_view: $('#provider-calendar-view').val()
                 }
             };
 
@@ -343,6 +346,7 @@
         $('#providers .save-cancel-group').hide();
         $('#providers .record-details h3 a').remove();
         $('#providers .record-details').find('input, textarea').prop('readonly', true);
+        $('#providers .record-details').find('select').prop('disabled', true);
         $('#providers .form-message').hide();
         $('#provider-notifications').removeClass('active');
         $('#provider-notifications').prop('disabled', true);
@@ -382,6 +386,7 @@
         $('#provider-notes').val(provider.notes);
 
         $('#provider-username').val(provider.settings.username);
+        $('#provider-calendar-view').val(provider.settings.calendar_view);
         if (provider.settings.notifications == true) {
             $('#provider-notifications').addClass('active');
         } else {
diff --git a/src/assets/js/backend_users_secretaries.js b/src/assets/js/backend_users_secretaries.js
index 11270f81..d8bd5732 100644
--- a/src/assets/js/backend_users_secretaries.js
+++ b/src/assets/js/backend_users_secretaries.js
@@ -91,6 +91,7 @@
             $('#secretaries .add-edit-delete-group').hide();
             $('#secretaries .save-cancel-group').show();
             $('#secretaries .record-details').find('input, textarea').prop('readonly', false);
+            $('#secretaries .record-details').find('select').prop('disabled', false);
             $('#secretary-password, #secretary-password-confirm').addClass('required');
             $('#secretary-notifications').prop('disabled', false);
             $('#secretary-providers input[type="checkbox"]').prop('disabled', false);
@@ -105,6 +106,7 @@
             $('#secretaries .add-edit-delete-group').hide();
             $('#secretaries .save-cancel-group').show();
             $('#secretaries .record-details').find('input, textarea').prop('readonly', false);
+            $('#secretaries .record-details').find('select').prop('disabled', false);
             $('#secretary-password, #secretary-password-confirm').removeClass('required');
             $('#secretary-notifications').prop('disabled', false);
             $('#secretary-providers input[type="checkbox"]').prop('disabled', false);
@@ -147,7 +149,8 @@
                 notes: $('#secretary-notes').val(),
                 settings: {
                     username: $('#secretary-username').val(),
-                    notifications: $('#secretary-notifications').hasClass('active')
+                    notifications: $('#secretary-notifications').hasClass('active'),
+                    calendar_view: $('#secretary-calendar-view').val()
                 }
             };
 
@@ -302,6 +305,7 @@
         $('#secretaries .save-cancel-group').hide();
         $('#edit-secretary, #delete-secretary').prop('disabled', true);
         $('#secretaries .record-details').find('input, textarea').prop('readonly', true);
+        $('#secretaries .record-details').find('select').prop('disabled', true);
         $('#secretaries .form-message').hide();
         $('#secretary-notifications').removeClass('active');
         $('#secretary-notifications').prop('disabled', true);
@@ -334,6 +338,7 @@
         $('#secretary-notes').val(secretary.notes);
 
         $('#secretary-username').val(secretary.settings.username);
+        $('#secretary-calendar-view').val(secretary.settings.calendar_view);
         if (secretary.settings.notifications == true) {
             $('#secretary-notifications').addClass('active');
         } else {