change format restriction time

Author: Stigmatoz

scripts/activity.js

@@ -34,11 +34,15 @@ class Activity {
         else return false;
     }
 
-    checkRestrictionIfAny(domain){
+    checkRestrictionIfAny(domain, tab){
         if (setting_restriction_list !== undefined && setting_restriction_list.length > 0){
              var item = setting_restriction_list.find(o => o.domain === domain);
              if (item !== undefined){
-                 
+                 var today = new Date().toLocaleDateString();
+                 var todayTimeUse = tab.days.find(x => x.date == today).summary;
+                 if (todayTimeUse > item.time){
+                     
+                 }
              }
         }
         else return false;

scripts/background.js

@@ -38,7 +38,7 @@ function backgroundCheck() {
                     activity.setCurrentActiveTab(tab.url);
                     chrome.idle.queryState(parseInt(setting_interval_inactivity), function (state) {
                         if (state === 'active') {
-                            if (activity.checkRestrictionIfAny(activeUrl) && ){
+                            if (activity.checkRestrictionIfAny(activeUrl, tab)){
 
                             }
                             if (!activity.isInBlackList(activeUrl))

scripts/common.js

@@ -69,6 +69,17 @@ function convertSummaryTimeToBadgeString(summaryTime) {
     }
 }
 
+function convertShortSummaryTimeToString(summaryTime){
+    var hours = Math.floor(summaryTime / (3600 * 60));
+    var totalSeconds = summaryTime % 3600;
+    var mins = Math.floor(totalSeconds / 60);
+
+    hours = zeroAppend(hours);
+    mins = zeroAppend(mins);
+
+    return hours + 'h ' + mins + 'm';
+}
+
 function convertSummaryTimeToString(summaryTime) {
     var days = Math.floor(summaryTime / 3600 / 24);
     var totalHours = summaryTime % (3600 * 24);

scripts/restriction.js

@@ -3,6 +3,13 @@
 class Restriction {
     constructor(domain, time) {
         this.domain = domain;
-        this.time = time;
+        var timeValue = time.split(':');
+        var hour = timeValue[0];
+        var min = timeValue[1];
+        var resultTimeValue;
+        if (hour > 0)
+            resultTimeValue = hour * 60 * 3600;
+        resultTimeValue += min * 60;
+        this.time = resultTimeValue;
     }
 };

scripts/settings.js

@@ -133,10 +133,11 @@ function addNewRestrictionSiteClickHandler() {
     var newRestrictionTime = document.getElementById('addRestrictionTimeLbl').value;
     if (newRestrictionSite !== '' && newRestrictionTime !== '') {
         if (!isContainsRestrictionSite(newRestrictionSite)) {
-            addDomainToRestrictionListBox(new Restriction(newRestrictionSite, newRestrictionTime));
+            var restriction = new Restriction(newRestrictionSite, newRestrictionTime);
+            addDomainToRestrictionListBox(restriction);
             if (restrictionList === undefined)
                 restrictionList = [];
-            restrictionList.push(new Restriction(newRestrictionSite, newRestrictionTime));
+            restrictionList.push(restriction);
             document.getElementById('addRestrictionSiteLbl').value = '';
             document.getElementById('addRestrictionTimeLbl').value = '';
 
@@ -185,8 +186,7 @@ function addDomainToRestrictionListBox(resctiction) {
     });
 
     var timeElement = document.createElement('input');
-    var timeArray = resctiction.time.split(':');
-    var resultTime = timeArray[0] + 'h ' + timeArray[1] + 'm';
+    var resultTime = convertShortSummaryTimeToString(resctiction.time);
     timeElement.type = 'text';
     timeElement.value = resultTime;
     timeElement.readOnly = true;

style/settings.css

@@ -239,7 +239,7 @@ input[type="button"]:hover {
 
   .notify{
     width: 200px;
-    height: 30px;
+    height: 27px;
     margin: auto;
     background-color: rgb(118, 219, 93);
     color: rgb(0, 0, 0);
@@ -250,7 +250,7 @@ input[type="button"]:hover {
     z-index: 1;
     top: 10px;
     right: 20px;
-    font-size: 17px;
+    font-size: 15px;
     white-space: nowrap;
     padding: 10px;
   }
@@ -299,5 +299,23 @@ input[type="button"]:hover {
 
 #restrictionsList{
     width: 430px;
-    height: 170px;
+    height: 250px;
+}
+
+.inline-block{
+    display: inline-block !important;
+}
+
+.block{
+    display: block;
+}
+
+.readonly-input{
+    cursor: default;
+    border: 0;
+    display: block;
+}
+
+.restriction-item{
+    width: 380px;
 }