Skip to content

Commit 7fdb471

Browse files
committed
Added a grace period for schedule based capture alerts
1 parent 8e750cd commit 7fdb471

File tree

16 files changed

+42
-9
lines changed

16 files changed

+42
-9
lines changed

Sencha/App6.0/workspace/Desktop/app/controller/sourcesconfiguration/advanced/Advanced.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
2626
, "sourcesconfiguration.advanced.scheduleslot.Main"
2727
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslot"
2828
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotfailure"
29+
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotgrace"
2930
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotreminder"
3031
/*
3132
, "sourcesconfiguration.advanced.scheduledelay.Main"
@@ -69,6 +70,7 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
6970
, {ref: "sourcesconfigurationadvancedscheduleslotmain", selector: "sourcesconfigurationadvancedscheduleslotmain" }
7071
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot" }
7172
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure" }
73+
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace" }
7274
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder" }
7375
/*
7476
, {ref: "sourcesconfigurationadvancedscheduledelaymain", selector: "sourcesconfigurationadvancedscheduledelaymain" }
@@ -163,6 +165,8 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
163165
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot().setVisible(false);}
164166
if(configObj.hasOwnProperty("cfgemailalertscheduleslotfailure")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure().setValue(configObj["cfgemailalertscheduleslotfailure"]);
165167
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure().setVisible(false);}
168+
if(configObj.hasOwnProperty("cfgemailalertscheduleslotgrace")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace().setValue(configObj["cfgemailalertscheduleslotgrace"]);
169+
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace().setVisible(false);}
166170
if(configObj.hasOwnProperty("cfgemailalertscheduleslotreminder")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder().setValue(configObj["cfgemailalertscheduleslotreminder"]);
167171
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder().setVisible(false);}
168172
/*

Sencha/App6.0/workspace/Desktop/app/controller/sourcesconfiguration/phidgets/Phidgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Ext.define("WPAKD.controller.sourcesconfiguration.phidgets.Phidgets", {
161161
configName = rec.get("NAME");
162162
configObj[configName] = true;
163163
});
164-
if(!configObj.hasOwnProperty("email")){this.getSourcesconfigurationphidgetsemailsmain().setVisible(false);}
164+
//if(!configObj.hasOwnProperty("email")){this.getSourcesconfigurationphidgetsemailsmain().setVisible(false);}
165165
if(!configObj.hasOwnProperty("phidget")){this.getSourcesconfigurationphidgetsphidgetmain().setVisible(false);}
166166

167167
this.getSourcesconfigurationphidgetsmain().setDisabled(false);

Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/scheduleslot/Cfgemailalertscheduleslotfailure.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduleslot.Cfgemailalerts
66
extend: "Ext.form.field.Number"
77
, alias: "widget.sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure"
88

9-
, fieldLabel: i18n.gettext("Send an email if no capture for more than ")
9+
, fieldLabel: i18n.gettext("Send an email if no capture for more than")
1010
, allowBlank: false
1111
, minValue:0
1212
, listeners : {
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*global Ext, i18n*/
2+
//<debug>
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotgrace");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotgrace", {
6+
extend: "Ext.form.field.Number"
7+
, alias: "widget.sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace"
8+
9+
, fieldLabel: i18n.gettext("Grace period")
10+
, allowBlank: false
11+
, minValue:0
12+
, listeners : {
13+
change : function(scope, newValue, oldValue) {
14+
this.fireEvent("WPAKD.controller.sourcesconfiguration.advanced.Advanced.updateStoreValue", newValue, oldValue, "cfgemailalertscheduleslotgrace");
15+
}
16+
}
17+
});

Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/scheduleslot/Main.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduleslot.Main", {
2020
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure" }
2121
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("missing captures"), labelSeparator: "", padding: "0 5 0 5" }
2222
]
23-
}
23+
}
24+
, {
25+
xtype: "container"
26+
, layout: {type:"hbox", align: "stretch", pack: "start"}
27+
, items : [
28+
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace" }
29+
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes"), labelSeparator: "", padding: "0 5 0 5" }
30+
]
31+
}
2432
, {
2533
xtype: "container"
2634
, layout: {type:"hbox", align: "stretch", pack: "start"}

Sencha/App6.0/workspace/Desktop/bootstrap.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Sencha/App6.0/workspace/Desktop/bootstrap.jsonp

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Sencha/App6.0/workspace/Desktop/sass/example/bootstrap.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Sencha/App6.0/workspace/Desktop/sass/example/bootstrap.jsonp

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Sencha/App6.0/workspace/build/production/WPAKD/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)