sinatra-hexacta 1.7.4 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a5abe8c678f588839389b8b76c45c6849c90678054e5c9ee6d725bdaea6bb4
-  data.tar.gz: 9bb209941df45a2f736cf559c85e6bb8c695bf5e9a0da54008020b1d42b741ac
+  metadata.gz: 64aad875765320466eb0d85f6a1fc12d369d86d0483b1675878bfb6f770c9571
+  data.tar.gz: ac0ea17df7526a6d9b251d158aea06cd6dc613d876b912101cdbcb75e0a57441
 SHA512:
-  metadata.gz: 3d53304326eeb461dc0f7276461b80241a06fbbc84468250b1bd65e2cea9a2f37f805414a5d6b3492576e69fda15548eeb84c9c2ec475b4886df8bb3f8b12eb2
-  data.tar.gz: 332e75bb6823fe6c40a50aeb3b89f5e42d3f15ad60a953b71a4abb08fdacfd9f81c5d8d209f217d4ac94660b2ecbc75e8f93040bb54c544b05759b83e8ec6dd1
+  metadata.gz: 3fa811da4467aa7db81acfb358f34e59074768478db1864b547433ddae3aed054b74bc65d42b099f70c1e852d93215e448ccab4ce984201eb04d14c0dc8a2955
+  data.tar.gz: 3d76123dea2ffb9e0bfc3cfdf31484a63bba67850a7e7111d7b33edfc5cb30a1bb247c7d0ce9156f94d6535a897601cd6bbd0bd6d2764d0ad3d1fa89e1513815

data/lib/sinatra/extensions/date.rb

@@ -26,13 +26,21 @@ class Date
   end
 
   def display
-    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]} #{self.year == Date.today.year ? '' : self.year}"
+    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]}, #{self.year}"
   end
 
   def short_display
     self.strftime('%-d/%-m/%Y')
   end
 
+  def add_working_days(days=1)
+    new_date = self + days
+    while (new_date.wday % 7 == 0) or (new_date.wday % 7 == 6) or Holiday.date(new_date).count > 0 do
+      new_date += 1
+    end
+    new_date
+  end
+
   def next_working_date
     add_working_days(1)
   end

data/lib/sinatra/extensions/date_time.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+class DateTime
+
+  def display
+    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]} #{self.year == Date.today.year ? '' : self.year}"
+  end
+
+  def short_display
+    self.strftime('%-d/%-m/%Y')
+  end
+
+end

data/lib/sinatra/extensions/init.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require_relative 'antiquity'
 require_relative 'date'
+require_relative 'date_time'
 require_relative 'mailbuilder'
 require_relative 'mailsender'
 require_relative 'mail'

data/lib/sinatra/public/js/app.js

@@ -27,6 +27,31 @@ function update_html_elements() {
 
     $("form.async").unbind("submit").submit(function(e){
       e.preventDefault();
+
+
+      $(this).find(':input[required]').each(function() {
+        if ($(this).val() == "" || $(this).val() == null) {
+          $(this).parent().removeClass("success");
+          $(this).parent().addClass("error");
+        } else {
+          $(this).parent().removeClass("error");
+          $(this).parent().addClass("success");
+        }
+      });
+
+      $(this).find('.chosen[required]').each(function() {
+        if ($(this).val() == "" || $(this).val() == null) {
+          $(this).parent().removeClass("success");
+          $(this).parent().addClass("error");
+        } else {
+          $(this).parent().removeClass("error");
+          $(this).parent().addClass("success");
+        }
+      });
+      if ($(this).find('.error').length > 0 ) {
+        return;
+      }
+
       var datastring = $(this).serialize();
       var url = $(this).attr('action');
       $(this).closest('.modal').modal('hide');
@@ -125,63 +150,6 @@ function update_html_elements() {
         }
     }
 
-    /*
-     * Sidebar
-     */
-    (function(){
-        //Toggle
-        $('body').on('click', '#menu-trigger', function(e){
-            e.preventDefault();
-            var x = $(this).data('trigger');
-
-            $(x).toggleClass('toggled');
-            $(this).toggleClass('open');
-
-          //Close opened sub-menus
-          $('.sub-menu.toggled').not('.active').each(function(){
-            $(this).removeClass('toggled');
-            $(this).find('ul').hide();
-          });
-
-          $('.profile-menu .main-menu').hide();
-
-          if (x == '#sidebar') {
-
-              $elem = '#sidebar';
-              $elem2 = '#menu-trigger';
-
-              $('#chat-trigger').removeClass('open');
-
-              if (!$('#chat').hasClass('toggled')) {
-                  $('#header').toggleClass('sidebar-toggled');
-              }
-              else {
-                  $('#chat').removeClass('toggled');
-              }
-          }
-
-          //When clicking outside
-          if ($('#header').hasClass('sidebar-toggled')) {
-              $(document).on('click', function (e) {
-                  if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
-                      setTimeout(function(){
-                          $($elem).removeClass('toggled');
-                          $('#header').removeClass('sidebar-toggled');
-                          $($elem2).removeClass('open');
-                      });
-                  }
-              });
-          }
-        })
-
-        //Submenu
-        $('body').on('click', '.sub-menu > a', function(e){
-          e.preventDefault();
-          $(this).next().slideToggle(200);
-          $(this).parent().toggleClass('toggled');
-        });
-    })();
-
     /*
      * Clear Notification
      */
@@ -539,6 +507,48 @@ function update_html_elements() {
       $(this).find(':submit').attr("disabled",false);
     });
 
+    /*
+     * Sidebar
+     */
+    (function(){
+        //Toggle
+        $('#menu-trigger').unbind('click').on('click', function(e){
+            e.preventDefault();
+            var x = $(this).data('trigger');
+
+            $(x).toggleClass('toggled');
+            $(this).toggleClass('open');
+
+          //Close opened sub-menus
+          $('.sub-menu.toggled').not('.active').each(function(){
+            $(this).removeClass('toggled');
+            $(this).find('ul').hide();
+          });
+
+          $('.profile-menu .main-menu').hide();
+
+          //When clicking outside
+          if ($('#header').hasClass('sidebar-toggled')) {
+              $(document).on('click', function (e) {
+                  if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
+                      setTimeout(function(){
+                          $($elem).removeClass('toggled');
+                          $('#header').removeClass('sidebar-toggled');
+                          $($elem2).removeClass('open');
+                      });
+                  }
+              });
+          }
+        })
+
+        //Submenu
+        $('.sub-menu > a').unbind('click').on('click', function(e){
+          e.preventDefault();
+          $(this).next().slideToggle(200);
+          $(this).parent().toggleClass('toggled');
+        });
+
+    })();
 }
 
 const elementToObserve = document.querySelector("body");
@@ -670,5 +680,9 @@ function read_notify(id,url) {
 }
 
 function capitalize(word) {
-  return word[0].toUpperCase() + word.slice(1).toLowerCase();
+  if (word == "") {
+    return "";
+  } else {
+    return word[0].toUpperCase() + word.slice(1).toLowerCase();
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.8
 platform: ruby
 authors:
 - Marco Zanger
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - lib/sinatra/extensions/antiquity.rb
 - lib/sinatra/extensions/date.rb
+- lib/sinatra/extensions/date_time.rb
 - lib/sinatra/extensions/generalmail.rb
 - lib/sinatra/extensions/generalmailnolink.rb
 - lib/sinatra/extensions/init.rb