Skip to content

Commit 839b04d

Browse files
FgerthoffertFgerthoffert
authored
Merge pull request #5 from Webcampak/develop
Refactored the email alerts UI
2 parents fe9b45b + 7fdb471 commit 839b04d

31 files changed

+422
-18
lines changed

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

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
1818
, "sourcesconfiguration.advanced.emails.Cfgemailsendcc"
1919
, "sourcesconfiguration.advanced.emails.Cfgemailsendto"
2020

21+
, "sourcesconfiguration.advanced.time.Main"
22+
, "sourcesconfiguration.advanced.time.Cfgemailalerttime"
23+
, "sourcesconfiguration.advanced.time.Cfgemailalerttimefailure"
24+
, "sourcesconfiguration.advanced.time.Cfgemailalerttimereminder"
25+
26+
, "sourcesconfiguration.advanced.scheduleslot.Main"
27+
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslot"
28+
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotfailure"
29+
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotgrace"
30+
, "sourcesconfiguration.advanced.scheduleslot.Cfgemailalertscheduleslotreminder"
31+
/*
32+
, "sourcesconfiguration.advanced.scheduledelay.Main"
33+
, "sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelay"
34+
, "sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelayfailure"
35+
, "sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelayreminder"
36+
*/
2137
],
2238

2339
stores: [
@@ -46,6 +62,22 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
4662
, {ref: "sourcesconfigurationadvancedemailscfgemaildirectalert", selector: "sourcesconfigurationadvancedemailscfgemaildirectalert" }
4763
, {ref: "sourcesconfigurationadvancedemailscfgemailschedulealert", selector: "sourcesconfigurationadvancedemailscfgemailschedulealert" }
4864

65+
, {ref: "sourcesconfigurationadvancedtimemain", selector: "sourcesconfigurationadvancedtimemain" }
66+
, {ref: "sourcesconfigurationadvancedtimecfgemailalerttime", selector: "sourcesconfigurationadvancedtimecfgemailalerttime" }
67+
, {ref: "sourcesconfigurationadvancedtimecfgemailalerttimefailure", selector: "sourcesconfigurationadvancedtimecfgemailalerttimefailure" }
68+
, {ref: "sourcesconfigurationadvancedtimecfgemailalerttimereminder", selector: "sourcesconfigurationadvancedtimecfgemailalerttimereminder" }
69+
70+
, {ref: "sourcesconfigurationadvancedscheduleslotmain", selector: "sourcesconfigurationadvancedscheduleslotmain" }
71+
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot" }
72+
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure" }
73+
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace" }
74+
, {ref: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder", selector: "sourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder" }
75+
/*
76+
, {ref: "sourcesconfigurationadvancedscheduledelaymain", selector: "sourcesconfigurationadvancedscheduledelaymain" }
77+
, {ref: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay", selector: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay" }
78+
, {ref: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure", selector: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure" }
79+
, {ref: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder", selector: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder" }
80+
*/
4981
]
5082

5183
, init: function() {
@@ -109,18 +141,42 @@ Ext.define("WPAKD.controller.sourcesconfiguration.advanced.Advanced", {
109141
configObj[configName] = configValue;
110142
});
111143

144+
if(configObj.hasOwnProperty("cfgemailalwaysnotify")){this.getSourcesconfigurationadvancedemailscfgemailalwaysnotify().setValue(configObj["cfgemailalwaysnotify"]);
145+
} else {this.getSourcesconfigurationadvancedemailscfgemailalwaysnotify().setVisible(false);}
146+
/*
112147
if(configObj.hasOwnProperty("cfgemailalertfailure")){this.getSourcesconfigurationadvancedemailscfgemailalertfailure().setValue(configObj["cfgemailalertfailure"]);
113148
} else {this.getSourcesconfigurationadvancedemailscfgemailalertfailure().setVisible(false);}
114149
if(configObj.hasOwnProperty("cfgemailalertreminder")){this.getSourcesconfigurationadvancedemailscfgemailalertreminder().setValue(configObj["cfgemailalertreminder"]);
115150
} else {this.getSourcesconfigurationadvancedemailscfgemailalertreminder().setVisible(false);}
116-
if(configObj.hasOwnProperty("cfgemailalwaysnotify")){this.getSourcesconfigurationadvancedemailscfgemailalwaysnotify().setValue(configObj["cfgemailalwaysnotify"]);
117-
} else {this.getSourcesconfigurationadvancedemailscfgemailalwaysnotify().setVisible(false);}
118151
119152
if(configObj.hasOwnProperty("cfgemaildirectalert")){this.getSourcesconfigurationadvancedemailscfgemaildirectalert().setValue(configObj["cfgemaildirectalert"]);
120153
} else {this.getSourcesconfigurationadvancedemailscfgemaildirectalert().setVisible(false);}
121154
if(configObj.hasOwnProperty("cfgemailschedulealert")){this.getSourcesconfigurationadvancedemailscfgemailschedulealert().setValue(configObj["cfgemailschedulealert"]);
122155
} else {this.getSourcesconfigurationadvancedemailscfgemailschedulealert().setVisible(false);}
123-
156+
*/
157+
if(configObj.hasOwnProperty("cfgemailalerttime")){this.getSourcesconfigurationadvancedtimecfgemailalerttime().setValue(configObj["cfgemailalerttime"]);
158+
} else {this.getSourcesconfigurationadvancedtimecfgemailalerttime().setVisible(false);}
159+
if(configObj.hasOwnProperty("cfgemailalerttimefailure")){this.getSourcesconfigurationadvancedtimecfgemailalerttimefailure().setValue(configObj["cfgemailalerttimefailure"]);
160+
} else {this.getSourcesconfigurationadvancedtimecfgemailalerttimefailure().setVisible(false);}
161+
if(configObj.hasOwnProperty("cfgemailalerttimereminder")){this.getSourcesconfigurationadvancedtimecfgemailalerttimereminder().setValue(configObj["cfgemailalerttimereminder"]);
162+
} else {this.getSourcesconfigurationadvancedtimecfgemailalerttimereminder().setVisible(false);}
163+
164+
if(configObj.hasOwnProperty("cfgemailalertscheduleslot")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot().setValue(configObj["cfgemailalertscheduleslot"]);
165+
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslot().setVisible(false);}
166+
if(configObj.hasOwnProperty("cfgemailalertscheduleslotfailure")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure().setValue(configObj["cfgemailalertscheduleslotfailure"]);
167+
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotfailure().setVisible(false);}
168+
if(configObj.hasOwnProperty("cfgemailalertscheduleslotgrace")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace().setValue(configObj["cfgemailalertscheduleslotgrace"]);
169+
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotgrace().setVisible(false);}
170+
if(configObj.hasOwnProperty("cfgemailalertscheduleslotreminder")){this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder().setValue(configObj["cfgemailalertscheduleslotreminder"]);
171+
} else {this.getSourcesconfigurationadvancedscheduleslotcfgemailalertscheduleslotreminder().setVisible(false);}
172+
/*
173+
if(configObj.hasOwnProperty("cfgemailalertscheduledelay")){this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay().setValue(configObj["cfgemailalertscheduledelay"]);
174+
} else {this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay().setVisible(false);}
175+
if(configObj.hasOwnProperty("cfgemailalertscheduledelayfailure")){this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure().setValue(configObj["cfgemailalertscheduledelayfailure"]);
176+
} else {this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure().setVisible(false);}
177+
if(configObj.hasOwnProperty("cfgemailalertscheduledelayreminder")){this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder().setValue(configObj["cfgemailalertscheduledelayreminder"]);
178+
} else {this.getSourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder().setVisible(false);}
179+
*/
124180

125181
var configObj = {};
126182
this.getSourcesconfigurationSectionCaptureStore().each(function (rec) {

‎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/Main.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.Main", {
1313
, defaults: {margin: 10}
1414
, items: [
1515
{xtype: "sourcesconfigurationadvancedemailsmain" }
16+
, {xtype: "sourcesconfigurationadvancedtimemain" }
17+
, {xtype: "sourcesconfigurationadvancedscheduleslotmain" }
18+
// , {xtype: "sourcesconfigurationadvancedscheduledelaymain" }
1619
]
1720
});
1821

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/emails/Cfgemaildirectalert.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.emails.Cfgemaildirectalert"
77
, alias: "widget.sourcesconfigurationadvancedemailscfgemaildirectalert"
88

99
, fieldLabel: i18n.gettext("In-line email alert")
10-
, boxLabel: i18n.gettext("Email alerts will be sent directly based on capture status")
10+
, boxLabel: i18n.gettext("Email alerts will be sent directly based on capture status (using minutes)")
1111
, uncheckedValue: "no"
1212
, inputValue: "yes"
1313
, listeners : {

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/emails/Cfgemailschedulealert.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.emails.Cfgemailschedulealer
77
, alias: "widget.sourcesconfigurationadvancedemailscfgemailschedulealert"
88

99
, fieldLabel: i18n.gettext("Schedule-based email alerts")
10-
, boxLabel: i18n.gettext("Email alerts are sent based on a pre-configured alert schedule")
10+
, boxLabel: i18n.gettext("Email alerts are sent based on a pre-configured alert schedule (using iterations)")
1111
, uncheckedValue: "no"
1212
, inputValue: "yes"
1313
, listeners : {

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,32 @@ Ext.define("WPAKD.view.sourcesconfiguration.advanced.emails.Main", {
66
extend: "Ext.form.FieldSet"
77
, alias: "widget.sourcesconfigurationadvancedemailsmain"
88

9-
, title: i18n.gettext("Emails")
9+
, title: i18n.gettext("General Email Configuration")
1010

1111
, padding: 5
1212
, layout: "fit"
1313
, defaults: {labelWidth: 250}
1414
, items: [
15-
{xtype: "sourcesconfigurationadvancedemailscfgemaildirectalert"}
15+
/* {xtype: "sourcesconfigurationadvancedemailscfgemaildirectalert"}
1616
, {xtype: "sourcesconfigurationadvancedemailscfgemailschedulealert"}
1717
, {
1818
xtype: "container"
1919
, layout: {type:"hbox", align: "stretch", pack: "start"}
2020
, items : [
2121
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedemailscfgemailalertfailure" }
22-
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes late (0 = never)"), labelSeparator: "", padding: "0 5 0 5" }
22+
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes or iterations late (0 = never)"), labelSeparator: "", padding: "0 5 0 5" }
2323
]
2424
}
2525
, {
2626
xtype: "container"
2727
, layout: {type:"hbox", align: "stretch", pack: "start"}
2828
, items : [
2929
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedemailscfgemailalertreminder" }
30-
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes (0 = never)"), labelSeparator: "", padding: "0 5 0 5" }
30+
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes or iterations (0 = never)"), labelSeparator: "", padding: "0 5 0 5" }
3131
]
3232
}
33-
, {xtype: "sourcesconfigurationadvancedemailscfgemailalwaysnotify"}
33+
*/
34+
{xtype: "sourcesconfigurationadvancedemailscfgemailalwaysnotify"}
3435
]
3536
});
3637

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/scheduledelay/Cfgemailalertscheduledelay.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*global Ext, i18n*/
2+
//<debug>
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelay");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelay", {
6+
extend: "Ext.form.field.Checkbox"
7+
, alias: "widget.sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay"
8+
9+
, fieldLabel: i18n.gettext("Enable Time based alerts")
10+
, boxLabel: i18n.gettext("Email alerts will be sent based on time since last planned capture")
11+
, uncheckedValue: "no"
12+
, inputValue: "yes"
13+
, listeners : {
14+
change : function(scope, newValue, oldValue) {
15+
if (newValue === true) {newValue = "yes";} else {newValue = "no";}
16+
if (oldValue === true) {oldValue = "yes";} else {oldValue = "no";}
17+
this.fireEvent("WPAKD.controller.sourcesconfiguration.advanced.Advanced.updateStoreValue", newValue, oldValue, "cfgemailalertscheduledelay");
18+
}
19+
}
20+
});
21+

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/scheduledelay/Cfgemailalertscheduledelayfailure.js‎

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.scheduledelay.Cfgemailalertscheduledelayfailure");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelayfailure", {
6+
extend: "Ext.form.field.Number"
7+
, alias: "widget.sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure"
8+
9+
, fieldLabel: i18n.gettext("Send an email if no capture for more than ")
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, "cfgemailalertscheduledelayfailure");
15+
}
16+
}
17+
});

‎Sencha/App6.0/workspace/Desktop/app/view/sourcesconfiguration/advanced/scheduledelay/Cfgemailalertscheduledelayreminder.js‎

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.scheduledelay.Cfgemailalertscheduledelayreminder");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Cfgemailalertscheduledelayreminder", {
6+
extend: "Ext.form.field.Number"
7+
, alias: "widget.sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder"
8+
9+
, fieldLabel: i18n.gettext("Send a reminder every")
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, "cfgemailalertscheduledelayreminder");
15+
}
16+
}
17+
});

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*global Ext, i18n*/
2+
//<debug>
3+
console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Main");
4+
//</debug>
5+
Ext.define("WPAKD.view.sourcesconfiguration.advanced.scheduledelay.Main", {
6+
extend: "Ext.form.FieldSet"
7+
, alias: "widget.sourcesconfigurationadvancedscheduledelaymain"
8+
9+
, title: i18n.gettext("Schedule Based Alerts (time since on-schedule last capture)")
10+
11+
, padding: 5
12+
, layout: "fit"
13+
, defaults: {labelWidth: 250}
14+
, items: [
15+
{xtype: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelay"}
16+
, {
17+
xtype: "container"
18+
, layout: {type:"hbox", align: "stretch", pack: "start"}
19+
, items : [
20+
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayfailure" }
21+
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes"), labelSeparator: "", padding: "0 5 0 5" }
22+
]
23+
}
24+
, {
25+
xtype: "container"
26+
, layout: {type:"hbox", align: "stretch", pack: "start"}
27+
, items : [
28+
{width: 320, labelWidth: 250, xtype: "sourcesconfigurationadvancedscheduledelaycfgemailalertscheduledelayreminder" }
29+
, {width: 140, labelWidth: 250, xtype: "fieldcontainer", fieldLabel: i18n.gettext("minutes"), labelSeparator: "", padding: "0 5 0 5" }
30+
]
31+
}
32+
]
33+
});
34+

0 commit comments

Comments
 (0)