From a1e19cc75d31131a31000162f1c80b7d10787674 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 14 Dec 2016 00:16:03 +0100
Subject: [PATCH] Fixed issue #418 - Max times for escalation 99 hours.

---
 .../app/lib/bootstrap/bootstrap-timepicker.js | 23 +++++++++++++------
 app/assets/stylesheets/zammad.scss            |  8 ++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
index 2df178a6f..017c2a219 100644
--- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
+++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
@@ -485,13 +485,21 @@
     },
 
     highlightHour: function() {
+      var time = this.$element.val(),
+        timeArray = time.replace(/[^0-9\:]/g, '').split(':'),
+        hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(),
+        hour_max_length = hour.toString().length
       this.highlightedUnit = 'hour';
-      this.setSelectionRange(0, 2);
+      this.setSelectionRange(0, hour_max_length);
     },
 
     highlightMinute: function() {
+      var time = this.$element.val(),
+        timeArray = time.replace(/[^0-9\:]/g, '').split(':'),
+        hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(),
+        hour_max_length = hour.toString().length
       this.highlightedUnit = 'minute';
-      this.setSelectionRange(3, 5);
+      this.setSelectionRange(hour_max_length+1, hour_max_length+3);
     },
 
     highlightSecond: function() {
@@ -790,7 +798,8 @@
 
         hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString();
 
-        if(this.explicitMode && hour.length > 2 && (hour.length % 2) !== 0 ) {
+        var hour_max_length = this.maxHours.toString().length
+        if(this.explicitMode && hour.length > hour_max_length && (hour.length % 2) !== 0 ) {
           this.clear();
           return;
         }
@@ -804,9 +813,9 @@
           hour = hour.slice(0, -2);
         }
 
-        if (hour.length > 2) {
-          minute = hour.slice(-2);
-          hour = hour.slice(0, -2);
+        if (hour.length > hour_max_length) {
+          minute = hour.slice(-hour_max_length);
+          hour = hour.slice(0, -hour_max_length);
         }
 
         if (minute.length > 2) {
@@ -840,7 +849,7 @@
 
         if (hour > this.maxHours) {
           // No day/date handling.
-          hour = this.maxHours - 1;
+          hour = this.maxHours;
         }
 
         if (this.showMeridian) {
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 87efe2997..607b33fb3 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1594,7 +1594,6 @@ input[type=time] {
 
 input.timeframe,
 input.time {
-  width: 4.5ch;
   box-sizing: content-box;
   padding: 0 6px;
   line-height: 42px;
@@ -1605,6 +1604,13 @@ input.time {
   }
 }
 
+input.timeframe {
+  width: 5.5ch;
+}
+input.time {
+  width: 4.5ch;
+}
+
 input.time.time--12 {
   width: 7.5ch;
 }