Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

settings fixed, first version BangleTestRunner

master
Danny 2022-01-28 11:23:43 +01:00
parent fd60061c53
commit ad7b0df2a1
3 changed files with 290 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
apps/timecal/timecal.app.js
View File

@ -17,19 +17,19 @@ class TimeCalClock{
this._settings = require("Storage").readJSON("timecal.settings.json", 1) || {}; this._settings = require("Storage").readJSON("timecal.settings.json", 1) || {};
const defaults = { const defaults = {
showDate:"l", //(n)one, (l)ocale, (m)onth short(y)ear(w)eek shwDate:1, //0:none, 1:locale, 2:month, 3:monthshort.year #week
wdStrt:1, //identical to getDay() 0->Su, 1->Mo, ... //Issue #1154: weekstart So/Mo, wdStrt:1, //identical to getDay() 0->Su, 1->Mo, ... //Issue #1154: weekstart So/Mo, -1 for use today
todayNumClr:"#00E", tdyNumClr:0, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
todayMrker:"r", //(n)one, (c)ircle, (r)ect, (f)illed tdyMrkr:0, //0:none, 1:circle, 2:rectangle, 3:filled
todayMrkClr:"#0E0", tdyMrkClr:2, //1:red=#E00, 2:green=#0E0, 3:blue=#00E
todayMrkMrkPxl:3, tdyMrkPxl:3, //px
suColor:"#E00", //sunday suClr:0, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
phColor:"#E00", //public holiday //phColor:"#E00", //public holiday
calBorder:true calBrdr:false
}; };
for (const k in this._settings) if (!defaults.hasOwnProperty(k)) delete this._settings[k]; //remove invalid settings for (const k in this._settings) if (!defaults.hasOwnProperty(k)) delete this._settings[k]; //remove invalid settings
for (const k in defaults) if(!this._settings.hasOwnProperty(k)) this._settings[k] = defaults[k]; //assign missing defaults for (const k in defaults) if(!this._settings.hasOwnProperty(k)) this._settings[k] = defaults[k]; //assign missing defaults
@ -39,7 +39,9 @@ class TimeCalClock{
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
this.center_x = Bangle.appRect.w/2; this.centerX = Bangle.appRect.w/2;
this.nrgb = [g.theme.fg, "#E00", "#0E0", "#00E"]; //fg, r ,g , b
this.ABR_DAY = require("locale") && require("locale").abday ? require("locale").abday : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
} }
/** /**
@ -64,7 +66,6 @@ class TimeCalClock{
*/ */
drawTime(){ drawTime(){
d=this.date ? this.date : new Date(); d=this.date ? this.date : new Date();
console.log("drawTime", d);
const Y=Bangle.appRect.y+this.DATE_FONT_SIZE()+10; const Y=Bangle.appRect.y+this.DATE_FONT_SIZE()+10;
d=d?d :new Date(); d=d?d :new Date();
@ -73,7 +74,7 @@ class TimeCalClock{
g.setFont("Vector", this.TIME_FONT_SIZE()); g.setFont("Vector", this.TIME_FONT_SIZE());
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7);
g.drawString(("0" + require("locale").time(d, 1)).slice(-5), this.center_x, Y); g.drawString(("0" + require("locale").time(d, 1)).slice(-5), this.centerX, Y);
//.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); //DEV-Option //.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); //DEV-Option
setTimeout(this.drawTime.bind(this), 60000-(d.getSeconds()*1000)-d.getMilliseconds()); setTimeout(this.drawTime.bind(this), 60000-(d.getSeconds()*1000)-d.getMilliseconds());
@ -107,9 +108,9 @@ class TimeCalClock{
const Y=Bangle.appRect.y; const Y=Bangle.appRect.y;
var render=false; var render=false;
var dateStr = ""; var dateStr = "";
console.log(">"+this.settings().showDate+"<"); if (this.settings().shwDate>0) { //skip if exactly -none
if (!(this.settings().showDate==="n")) const dateSttngs = ["","l","M","m.Y #W"];
for (let c of this.settings().showDate) { //add part as configured for (let c of dateSttngs[this.settings().shwDate]) { //add part as configured
switch (c){ switch (c){
case "l":{ //locale case "l":{ //locale
render=true; render=true;
@ -121,12 +122,26 @@ class TimeCalClock{
dateStr+=require("locale").month(d,1); dateStr+=require("locale").month(d,1);
break; break;
} }
case "y":{ //year e.g. 2022 case "M":{ //month e.g. January
render=true;
dateStr+=require("locale").month(d,0);
break;
}
case "y":{ //year e.g. 22
render=true;
dateStr+=d.getFullYear().slice(-2);
break;
}
case "Y":{ //year e.g. 2022
render=true; render=true;
dateStr+=d.getFullYear(); dateStr+=d.getFullYear();
break; break;
} }
case "w":{ //week e.g. #02 case "w":{ //week e.g. #2
dateStr+=(this.ISO8601calWeek(d));
break;
}
case "W":{ //week e.g. #02
dateStr+=("0"+this.ISO8601calWeek(d)).slice(-2); dateStr+=("0"+this.ISO8601calWeek(d)).slice(-2);
break; break;
} }
@ -136,12 +151,13 @@ class TimeCalClock{
break; //noop break; //noop
} }
} }
}
if (render){ if (render){
g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3);
g.setFont("Vector", FONT_SIZE); g.setFont("Vector", FONT_SIZE);
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
g.drawString(dateStr,this.center_x,Y); g.drawString(dateStr,this.centerX,Y);
} }
//g.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); //DEV-Option //g.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); //DEV-Option
} }
@ -161,19 +177,18 @@ class TimeCalClock{
g.clearRect(Bangle.appRect.x, CAL_Y, Bangle.appRect.x2, CAL_Y+CAL_AREA_H); g.clearRect(Bangle.appRect.x, CAL_Y, Bangle.appRect.x2, CAL_Y+CAL_AREA_H);
var dNames=[];
if (require("locale") && require("locale").abday)
dNames=require("locale").abday.map((a) => a.length>2 ? a.substr(0, 2) : a ); //retrieve from locale and force max 2 chars
else
dNames=["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]; //fallback
g.setFont("Vector", DAY_NAME_FONT_SIZE); g.setFont("Vector", DAY_NAME_FONT_SIZE);
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.setFontAlign(-1, -1); g.setFontAlign(-1, -1);
const tdyDate=d.getDate();
const sttngsWdStrt=this.settings().wdStrt>=0 ? this.settings().wdStrt : tdyDate.getDay();
//draw grid & Headline //draw grid & Headline
const dNames = this.ABR_DAY.map((a) => a.length<=2 ? a : a.substr(0, 2)); //force shrt 2
for(var dNo=0; dNo<dNames.length; dNo++){ for(var dNo=0; dNo<dNames.length; dNo++){
const dName=dNames[(dNo+this.settings().wdStrt)%7]; const dName=dNames[(dNo+sttngsWdStrt)%7];
g.drawString(dName, dNo*CELL_W+(CELL_W-g.stringWidth(dName))/2+2, CAL_Y+1); //center Names g.drawString(dName, dNo*CELL_W+(CELL_W-g.stringWidth(dName))/2+2, CAL_Y+1); //center Names
if(dNo>0) if(dNo>0)
g.drawLine(dNo*CELL_W, CAL_Y, dNo*CELL_W, CAL_Y+CAL_AREA_H-1); g.drawLine(dNo*CELL_W, CAL_Y, dNo*CELL_W, CAL_Y+CAL_AREA_H-1);
@ -189,31 +204,30 @@ class TimeCalClock{
g.setFont("Vector", DAY_NUM_FONT_SIZE); g.setFont("Vector", DAY_NUM_FONT_SIZE);
//write days //write days
const todayDate=d.getDate(); const days=7+(7+d.getDay()-sttngsWdStrt)%7;//start day (week before=7 days + days in this week realtive to week start)
const days=7+(7+d.getDay()-this.settings().wdStrt)%7;//start day (week before=7 days + days in this week realtive to week start)
var rD=new Date(); var rD=new Date();
rD.setDate(rD.getDate()-days); rD.setDate(rD.getDate()-days);
var rDate=rD.getDate(); var rDate=rD.getDate();
for(var y=0; y<3; y++){ for(var y=0; y<3; y++){
for(var x=0; x<dNames.length; x++){ for(var x=0; x<dNames.length; x++){
if(rDate===todayDate){ //today if(rDate===tdyDate){ //today
g.setColor(this.settings().todayMrkClr ? this.settings().todayMrkClr : g.theme.fg); //today marker color or fg color g.setColor(this.nrgb[this.settings().tdyMrkClr]); //today marker color or fg color
switch(this.settings().todayMrker){ //today marker switch(this.settings().tdyMrkr){ //0:none, 1:circle, 2:rectangle, 3:filled
case "c": case 1:
for(m=1; m<=this.settings().todayMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++) for(m=1; m<=this.settings().tdyMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++)
g.drawCircle(x*CELL_W+(CELL_W/2), nextY+(CELL_H*y)+(CELL_H/2), Math.min((CELL_W-m)/2, (CELL_H-m)/2)); g.drawCircle(x*CELL_W+(CELL_W/2), nextY+(CELL_H*y)+(CELL_H/2), Math.min((CELL_W-m)/2, (CELL_H-m)/2));
break; break;
case "r": case 2:
for(m=1; m<=this.settings().todayMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++) for(m=1; m<=this.settings().tdyMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++)
g.drawRect(x*CELL_W+m, nextY+CELL_H+m, x*CELL_W+CELL_W-m, nextY+CELL_H+CELL_H-m); g.drawRect(x*CELL_W+m, nextY+CELL_H+m, x*CELL_W+CELL_W-m, nextY+CELL_H+CELL_H-m);
break; break;
case "f": case 3:
g.fillRect(x*CELL_W+1, nextY+CELL_H+1, x*CELL_W+CELL_W-1, nextY+CELL_H+CELL_H-1); g.fillRect(x*CELL_W+1, nextY+CELL_H+1, x*CELL_W+CELL_W-1, nextY+CELL_H+CELL_H-1);
break; break;
default: default:
break; break;
} }
g.setColor(this.settings().todayNumClr ? this.settings().todayNumClr : g.theme.fg); //today color or fg color g.setColor(this.nrgb[this.settings().tdyNumClr]); //today color or fg color
}else if(this.settings().suColor && rD.getDay()==0){ //sundays }else if(this.settings().suColor && rD.getDay()==0){ //sundays
g.setColor(this.settings().suColor); g.setColor(this.settings().suColor);
}else{ //default }else{ //default
@ -249,4 +263,4 @@ class TimeCalClock{
} }
timeCalClock = new TimeCalClock(); timeCalClock.draw(); //replace with testcases timeCalClock = new TimeCalClock(); timeCalClock.draw();

216
apps/timecal/timecal.app.test.js
View File

@ -17,19 +17,19 @@ class TimeCalClock{
this._settings = require("Storage").readJSON("timecal.settings.json", 1) || {}; this._settings = require("Storage").readJSON("timecal.settings.json", 1) || {};
const defaults = { const defaults = {
showDate:"l", //(n)one, (l)ocale, (m)onth short(y)ear(w)eek shwDate:1, //0:none, 1:locale, 2:month, 3:monthshort.year #week
wdStrt:1, //identical to getDay() 0->Su, 1->Mo, ... //Issue #1154: weekstart So/Mo, wdStrt:1, //identical to getDay() 0->Su, 1->Mo, ... //Issue #1154: weekstart So/Mo, -1 for use today
todayNumClr:"#00E", tdyNumClr:0, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
todayMrker:"r", //(n)one, (c)ircle, (r)ect, (f)illed tdyMrkr:0, //0:none, 1:circle, 2:rectangle, 3:filled
todayMrkClr:"#0E0", tdyMrkClr:2, //1:red=#E00, 2:green=#0E0, 3:blue=#00E
todayMrkMrkPxl:3, tdyMrkPxl:3, //px
suColor:"#E00", //sunday suClr:0, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
phColor:"#E00", //public holiday //phColor:"#E00", //public holiday
calBorder:true calBrdr:false
}; };
for (const k in this._settings) if (!defaults.hasOwnProperty(k)) delete this._settings[k]; //remove invalid settings for (const k in this._settings) if (!defaults.hasOwnProperty(k)) delete this._settings[k]; //remove invalid settings
for (const k in defaults) if(!this._settings.hasOwnProperty(k)) this._settings[k] = defaults[k]; //assign missing defaults for (const k in defaults) if(!this._settings.hasOwnProperty(k)) this._settings[k] = defaults[k]; //assign missing defaults
@ -39,7 +39,9 @@ class TimeCalClock{
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
this.center_x = Bangle.appRect.w/2; this.centerX = Bangle.appRect.w/2;
this.nrgb = [g.theme.fg, "#E00", "#0E0", "#00E"]; //fg, r ,g , b
this.ABR_DAY = require("locale") && require("locale").abday ? require("locale").abday : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
} }
/** /**
@ -64,7 +66,6 @@ class TimeCalClock{
*/ */
drawTime(){ drawTime(){
d=this.date ? this.date : new Date(); d=this.date ? this.date : new Date();
console.log("drawTime", d);
const Y=Bangle.appRect.y+this.DATE_FONT_SIZE()+10; const Y=Bangle.appRect.y+this.DATE_FONT_SIZE()+10;
d=d?d :new Date(); d=d?d :new Date();
@ -73,7 +74,7 @@ class TimeCalClock{
g.setFont("Vector", this.TIME_FONT_SIZE()); g.setFont("Vector", this.TIME_FONT_SIZE());
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7);
g.drawString(("0" + require("locale").time(d, 1)).slice(-5), this.center_x, Y); g.drawString(("0" + require("locale").time(d, 1)).slice(-5), this.centerX, Y);
//.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); //DEV-Option //.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+this.TIME_FONT_SIZE()-7); //DEV-Option
setTimeout(this.drawTime.bind(this), 60000-(d.getSeconds()*1000)-d.getMilliseconds()); setTimeout(this.drawTime.bind(this), 60000-(d.getSeconds()*1000)-d.getMilliseconds());
@ -107,9 +108,9 @@ class TimeCalClock{
const Y=Bangle.appRect.y; const Y=Bangle.appRect.y;
var render=false; var render=false;
var dateStr = ""; var dateStr = "";
console.log(this.settings().showDate); if (this.settings().shwDate>0) { //skip if exactly -none
if (this.settings().showDate!=="n"); const dateSttngs = ["","l","M","m.Y #W"];
for (let c of this.settings().showDate) { //add part as configured for (let c of dateSttngs[this.settings().shwDate]) { //add part as configured
switch (c){ switch (c){
case "l":{ //locale case "l":{ //locale
render=true; render=true;
@ -121,12 +122,26 @@ class TimeCalClock{
dateStr+=require("locale").month(d,1); dateStr+=require("locale").month(d,1);
break; break;
} }
case "y":{ //year e.g. 2022 case "M":{ //month e.g. January
render=true;
dateStr+=require("locale").month(d,0);
break;
}
case "y":{ //year e.g. 22
render=true;
dateStr+=d.getFullYear().slice(-2);
break;
}
case "Y":{ //year e.g. 2022
render=true; render=true;
dateStr+=d.getFullYear(); dateStr+=d.getFullYear();
break; break;
} }
case "w":{ //week e.g. #02 case "w":{ //week e.g. #2
dateStr+=(this.ISO8601calWeek(d));
break;
}
case "W":{ //week e.g. #02
dateStr+=("0"+this.ISO8601calWeek(d)).slice(-2); dateStr+=("0"+this.ISO8601calWeek(d)).slice(-2);
break; break;
} }
@ -136,12 +151,13 @@ class TimeCalClock{
break; //noop break; //noop
} }
} }
}
if (render){ if (render){
g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); g.clearRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3);
g.setFont("Vector", FONT_SIZE); g.setFont("Vector", FONT_SIZE);
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
g.drawString(dateStr,this.center_x,Y); g.drawString(dateStr,this.centerX,Y);
} }
//g.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); //DEV-Option //g.drawRect(Bangle.appRect.x, Y, Bangle.appRect.x2, Y+FONT_SIZE-3); //DEV-Option
} }
@ -161,19 +177,18 @@ class TimeCalClock{
g.clearRect(Bangle.appRect.x, CAL_Y, Bangle.appRect.x2, CAL_Y+CAL_AREA_H); g.clearRect(Bangle.appRect.x, CAL_Y, Bangle.appRect.x2, CAL_Y+CAL_AREA_H);
var dNames=[];
if (require("locale") && require("locale").abday)
dNames=require("locale").abday.map((a) => a.length>2 ? a.substr(0, 2) : a ); //retrieve from locale and force max 2 chars
else
dNames=["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]; //fallback
g.setFont("Vector", DAY_NAME_FONT_SIZE); g.setFont("Vector", DAY_NAME_FONT_SIZE);
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.setFontAlign(-1, -1); g.setFontAlign(-1, -1);
const tdyDate=d.getDate();
const sttngsWdStrt=this.settings().wdStrt>=0 ? this.settings().wdStrt : tdyDate.getDay();
//draw grid & Headline //draw grid & Headline
const dNames = this.ABR_DAY.map((a) => a.length<=2 ? a : a.substr(0, 2)); //force shrt 2
for(var dNo=0; dNo<dNames.length; dNo++){ for(var dNo=0; dNo<dNames.length; dNo++){
const dName=dNames[(dNo+this.settings().wdStrt)%7]; const dName=dNames[(dNo+sttngsWdStrt)%7];
g.drawString(dName, dNo*CELL_W+(CELL_W-g.stringWidth(dName))/2+2, CAL_Y+1); //center Names g.drawString(dName, dNo*CELL_W+(CELL_W-g.stringWidth(dName))/2+2, CAL_Y+1); //center Names
if(dNo>0) if(dNo>0)
g.drawLine(dNo*CELL_W, CAL_Y, dNo*CELL_W, CAL_Y+CAL_AREA_H-1); g.drawLine(dNo*CELL_W, CAL_Y, dNo*CELL_W, CAL_Y+CAL_AREA_H-1);
@ -189,31 +204,30 @@ class TimeCalClock{
g.setFont("Vector", DAY_NUM_FONT_SIZE); g.setFont("Vector", DAY_NUM_FONT_SIZE);
//write days //write days
const todayDate=d.getDate(); const days=7+(7+d.getDay()-sttngsWdStrt)%7;//start day (week before=7 days + days in this week realtive to week start)
const days=7+(7+d.getDay()-this.settings().wdStrt)%7;//start day (week before=7 days + days in this week realtive to week start)
var rD=new Date(); var rD=new Date();
rD.setDate(rD.getDate()-days); rD.setDate(rD.getDate()-days);
var rDate=rD.getDate(); var rDate=rD.getDate();
for(var y=0; y<3; y++){ for(var y=0; y<3; y++){
for(var x=0; x<dNames.length; x++){ for(var x=0; x<dNames.length; x++){
if(rDate===todayDate){ //today if(rDate===tdyDate){ //today
g.setColor(this.settings().todayMrkClr ? this.settings().todayMrkClr : g.theme.fg); //today marker color or fg color g.setColor(this.nrgb[this.settings().tdyMrkClr]); //today marker color or fg color
switch(this.settings().todayMrker){ //today marker switch(this.settings().tdyMrkr){ //0:none, 1:circle, 2:rectangle, 3:filled
case "c": case 1:
for(m=1; m<=this.settings().todayMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++) for(m=1; m<=this.settings().tdyMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++)
g.drawCircle(x*CELL_W+(CELL_W/2), nextY+(CELL_H*y)+(CELL_H/2), Math.min((CELL_W-m)/2, (CELL_H-m)/2)); g.drawCircle(x*CELL_W+(CELL_W/2), nextY+(CELL_H*y)+(CELL_H/2), Math.min((CELL_W-m)/2, (CELL_H-m)/2));
break; break;
case "r": case 2:
for(m=1; m<=this.settings().todayMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++) for(m=1; m<=this.settings().tdyMrkPxl&&m<CELL_H-1&&m<CELL_W-1; m++)
g.drawRect(x*CELL_W+m, nextY+CELL_H+m, x*CELL_W+CELL_W-m, nextY+CELL_H+CELL_H-m); g.drawRect(x*CELL_W+m, nextY+CELL_H+m, x*CELL_W+CELL_W-m, nextY+CELL_H+CELL_H-m);
break; break;
case "f": case 3:
g.fillRect(x*CELL_W+1, nextY+CELL_H+1, x*CELL_W+CELL_W-1, nextY+CELL_H+CELL_H-1); g.fillRect(x*CELL_W+1, nextY+CELL_H+1, x*CELL_W+CELL_W-1, nextY+CELL_H+CELL_H-1);
break; break;
default: default:
break; break;
} }
g.setColor(this.settings().todayNumClr ? this.settings().todayNumClr : g.theme.fg); //today color or fg color g.setColor(this.nrgb[this.settings().tdyNumClr]); //today color or fg color
}else if(this.settings().suColor && rD.getDay()==0){ //sundays }else if(this.settings().suColor && rD.getDay()==0){ //sundays
g.setColor(this.settings().suColor); g.setColor(this.settings().suColor);
}else{ //default }else{ //default
@ -249,7 +263,13 @@ class TimeCalClock{
} }
//Copy above the src code of clock-app and load via espruino WEB IDE //*************************************************************************************
//*************************************************************************************
//*************************************************************************************
//Copy ABOVE the src code of clock-app and load via espruino WEB IDE
//*************************************************************************************
//*************************************************************************************
//*************************************************************************************
/** /**
* Severity for logging * Severity for logging
@ -326,7 +346,6 @@ class TestSetting extends Test{
TEST_SETTING_SAMPLE() { TEST_SETTING_SAMPLE() {
return { return {
setting: "<settingName>", setting: "<settingName>",
functionNames: ["required, <function under test>", "..."],
cases: [ cases: [
{ {
value: "required,<settingValue>", value: "required,<settingValue>",
@ -335,7 +354,10 @@ class TestSetting extends Test{
afterText: "optional,<textToDisplayAfterTest>", afterText: "optional,<textToDisplayAfterTest>",
afterExpression: "optional,<expressionExpectedTrue>" afterExpression: "optional,<expressionExpectedTrue>"
} }
] ],
constructorParams: ["optional: <cpar1>","|TEST_SETTINGS|","..."], //TEST_SETTINGS will be replcaed with each current {setting: case}
functionNames: ["required, <function under test>", "..."],
functionParams: ["optional: <fpar1>","|TEST_SETTINGS|","..."]
} }
} }
@ -344,7 +366,6 @@ class TestSetting extends Test{
this._validate(data); this._validate(data);
this.setting = data.setting; this.setting = data.setting;
this.methodNames = data.functionNames;
this.cases = data.cases.map((entry) => { this.cases = data.cases.map((entry) => {
return { return {
value: entry.value, value: entry.value,
@ -354,6 +375,9 @@ class TestSetting extends Test{
afterExpression: entry.afterExpression||true afterExpression: entry.afterExpression||true
}; };
}); });
this.constructorParams = data.constructorParams,
this.functionNames = data.functionNames;
this.functionParams = data.functionParams;
} }
/** /**
@ -362,11 +386,11 @@ class TestSetting extends Test{
_validate(data){ _validate(data){
//validate given config //validate given config
if (!data.setting) throw new EmptyMandatoryError("setting", data, this.TEST_SETTING_SAMPLE()); if (!data.setting) throw new EmptyMandatoryError("setting", data, this.TEST_SETTING_SAMPLE());
if (!data.cases instanceof Array || data.cases.length==0) throw new EmptyMandatoryError("cases", data, this.TEST_SETTING_SAMPLE()); if (!(data.cases instanceof Array) || data.cases.length==0) throw new EmptyMandatoryError("cases", data, this.TEST_SETTING_SAMPLE());
if (!data.functionNames instanceof Array || data.functionNames==0) throw new EmptyMandatoryError("functionNames", data, this.TEST_SETTING_SAMPLE()); if (!(data.functionNames instanceof Array) || data.functionNames==0) throw new EmptyMandatoryError("functionNames", data, this.TEST_SETTING_SAMPLE());
data.cases.forEach((entry,idx) => { data.cases.forEach((entry,idx) => {
if (!entry.value) throw new EmptyMandatoryError("cases["+idx+"].value", entry, this.TEST_SETTING_SAMPLE()); if (entry.value === undefined) throw new EmptyMandatoryError("cases["+idx+"].value", entry, this.TEST_SETTING_SAMPLE());
}); });
} }
} }
@ -398,8 +422,8 @@ class BangleTestRunner{
* add a Setting Test, return instance for chaining * add a Setting Test, return instance for chaining
* @param {TestSetting} * @param {TestSetting}
*/ */
addSetting(test) { addTestSettings(sttngs) {
this.tests.push(test); this.tests.push(new TestSetting(sttngs));
return this; return this;
} }
@ -416,14 +440,14 @@ class BangleTestRunner{
this._afterCase(); this._afterCase();
} }
this._afterTest(); this._afterTest();
}; }
} }
/** /**
* global prepare * global prepare - before all test
*/ */
_init() { _init() {
console.log(new Date(),">>init"); console.log(new Date().getTime(),">>init");
this.currentTestNum=-1; this.currentTestNum=-1;
this.currentCaseNum=-1; this.currentCaseNum=-1;
} }
@ -448,45 +472,33 @@ class BangleTestRunner{
} }
} }
/**
* testcase runner
*/
_runCase() { _runCase() {
console.log(new Date(), ">>running..."); console.log(new Date(), ">>running...");
var returns = []; var returns = [];
this.currentTest.methodNames.forEach((methodName) => { this.currentTest.functionNames.forEach((fName) => {
var instance = eval("new " + this.oClass + ""); var settings={}; settings[this.currentTest.setting] = this.currentCase.value;
console.log(instance); var cParams = this.currentTest.constructorParams||[];
const method = instance[methodName]; cParams = cParams.map((v) => (v && v instanceof String && v==="|TEST_SETTINGS|") ? settings : v)//replace settings in call params
//console.log(">>"+this.oClass+"["+methodName+"]()"); var fParams = this.currentTest.functionParams||[];
//if (typeof method !== "function") fParams = fParams.map((v) => (v && v instanceof String && v==="|TEST_SETTINGS|") ? settings : v)//replace settings in call params
// throw new InvalidMethodName(this.oClass, methodName);
let settings={}; settings[this.currentTest.setting] = this.currentCase.value; var creatorFunc = new Function("return new " + this.oClass + "(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5],arguments[6],arguments[7],arguments[8],arguments[9])"); //prepare spwan arguments[0],arguments[1]
returns.push(new TimeCalClock(new Date(), settings).drawDate()); let instance = creatorFunc.call(this.oClass, cParams[0], cParams[1], cParams[2], cParams[3], cParams[4], cParams[5], cParams[6], cParams[7], cParams[8], cParams[9]); //spwan
//returns.push(method());
console.log("<<"+this.oClass+"["+methodName+"]()"); console.log(">>"+this.oClass+"["+fName+"]()");
g.dump() returns.push(instance[fName](fParams[0], fParams[1], fParams[2], fParams[3], fParams[4], fParams[5], fParams[6], fParams[7], fParams[8], fParams[9])); //run method and store result
console.log("<<"+this.oClass+"["+fName+"]()");
g.dump();
}); });
//this._delay(1).then((result) => console.log(new Date(), "finished"));
//g.dump();
/*var testCaseNum=0;
test.cases.forEach(testcase => { //execute test
testcase.dates.forEach(date => { //spawn with each date
testCaseNum++;
E.showMessage(
"="+testcase.value+"\n"
+"expected: "+testcase.descr,
"#"+testCaseNum+": "+test.setting
);
this._delay(TESTCASE_MSG_TIMEOUT).then((r,e) => {
const objUnderTest = new Object.create(this.ObjClass)(date, new Object()[test.setting]=test.value );
objUnderTest.draw();
this._delay(TESTCASE_RUN_TIMEOUT).then((r,e) => {
});
});
});
});*/
console.log(new Date(), "<<...running"); console.log(new Date(), "<<...running");
} }
/**
* after each testcase
*/
_afterCase() { _afterCase() {
if (this.currentTest instanceof TestSetting) { if (this.currentTest instanceof TestSetting) {
if (this.currentCase.afterTxt.length>0) { if (this.currentCase.afterTxt.length>0) {
@ -498,10 +510,16 @@ class BangleTestRunner{
console.log(new Date(), "<<case #" + this.currentTestNum + "." + this.currentCaseNum + "/" + (this.currentTest.cases.length-1)); console.log(new Date(), "<<case #" + this.currentTestNum + "." + this.currentCaseNum + "/" + (this.currentTest.cases.length-1));
} }
/**
* after each test
*/
_afterTest() { _afterTest() {
console.log(new Date(), "<<test #" + this.currentTestNum); console.log(new Date(), "<<test #" + this.currentTestNum);
} }
/**
* after all tests
*/
_exit() { _exit() {
console.log(new Date(), "<<exit"); console.log(new Date(), "<<exit");
} }
@ -541,26 +559,20 @@ class BangleTestRunner{
} }
} }
/** /**
* Settings * TEST all Settings
*/ */
const SHOW_DATE_TESTS = new BangleTestRunner("TimeCalClock", LogSeverity.INFO)
{ .addTestSettings({
setting: "showDate", setting: "shwDate",
functionNames: ["drawDate"], cases: [
cases: [ { value: 0, beforeTxt:"No date display?", afterTxt: "top area should be 'emtpy'" },
{ value: "n", beforeTxt:"No date display?", afterTxt: "top area should be 'emtpy'", params:[new Date()] }, { value: 1, beforeTxt:"Locale date display?", afterTxt: "date should be 06/05/1234" },
{ value: "l", beforeTxt:"Locale date display?", afterTxt: "date should be 06/05/1234", params:[new Date(1234,5,6,7,8,9)] }, { value: 2, beforeTxt:"Month longname?", afterTxt: "date should be Jun" },
{ value: "m", beforeTxt:"Month shortname?", afterTxt: "date should be Jun", params:[new Date(1234,5,6,7,8,9)] }, { value: 3, beforeTxt:"Monthshort yearshort #week", afterTxt: "date should be Jun.34 #23" }
{ value: "m.y #w", beforeTxt:"Month short year week#", afterTxt: "date should be Jun.1234 #23", params:[new Date(1234,5,6,7,8,9)] } ],
] constructorParams: [new Date(1234,5,6,7,8,9),"|TEST_SETTINGS|"],
}; functionNames: ["drawDate"],
bangleTestRunner = new BangleTestRunner("TimeCalClock", LogSeverity.INFO) functionParams: [],
.addSetting(new TestSetting(SHOW_DATE_TESTS)) })
.execute(); .execute();
/**
* Clock
*/

148
apps/timecal/timecal.settings.js
View File

@ -1,31 +1,131 @@
// Settings menu for Time calendar clock // Settings menu for Time calendar clock
(function(back) { (function(save) {
DOW_abbr_FB = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; ABR_DAY = require("locale") && require("locale").abday ? require("locale").abday : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
var FILE = "timecal.settings.json"; var FILE = "timecal.settings.json";
// Load settings var settings = Object.assign( // Load settings and use defaults
var settings = Object.assign({ {
wdStrt: 1, //= fix at monday, 0: sun, -1: relative shwDate:1, //0:none, 1:locale, 2:month short, 3:month shortyear week
}, require('Storage').readJSON(FILE, true) || {});
wdStrt:0, //identical to getDay() 0->Su, 1->Mo, ... //Issue #1154: weekstart So/Mo, -1 for always focus/center today
function writeSettings() { tdyNumClr:3, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
tdyMrkr:0, //0:none, 1:circle, 2:rectangle, 3:filled
tdyMrkClr:2, //1:red=#E00, 2:green=#0E0, 3:blue=#00E
tdyMrkPxl:2, //px
suClr:0, //0:fg, 1:red=#E00, 2:green=#0E0, 3:blue=#00E
//phColor:"#E00", //public holiday
calBrdr:false
},
require('Storage').readJSON(FILE, true) || {}
);
const SETTINGS_AT_START = Object.assign(settings); //hardcopy of current and defaults
var saveSettings = () => {
require('Storage').writeJSON(FILE, settings); require('Storage').writeJSON(FILE, settings);
}; };
});
var mainmenu = { var restoreAndExitSettings = () => {
"": { require('Storage').writeJSON(FILE, SETTINGS_AT_START);
"title": "Time calendar clock" E.showMenu();
}, };
"< Back": () => back(),
"Cal.Start Day": { var showMainMenu = () => {
value: settings.wdStrt === undefined ? 1 : settings.wdStrt, //def: 1: mon E.showMenu({
min: -1, max: 6, "": {
//render dow from locale or LANG"today" "title": /*LANG*/"Time cal clock"
format: v => (v>=0 ? (require("locale") && require("locale").abday && require("locale").abday[v] ? : && require("locale").abday[v] : DOW_abbr_FB[v]) : /*LANG*/"today"), },
onchange: v => { /*LANG*/"< Save": () => save(),
settings.weekDay = v; /*LANG*/"Show date": {
writeSettings(); value: settings.shwDate,
} min: 0, max: 3,
} format: v => [/*LANG*/"none", /*LANG*/"locale", /*LANG*/"M", /*LANG*/"m.Y #W"][v],
}; onchange: v => {
settings.shwDate = v;
saveSettings();
}
},
/*LANG*/"Start wday": {
value: settings.wdStrt,
min: -1, max: 6,
format: v => v>=0 ? ABR_DAY[v] : /*LANG*/"today",
onchange: v => {
settings.wdStrt = v;
saveSettings();
}
},
/*LANG*/"Su color": {
value: settings.suClr,
min: 0, max: 3,
format: v => [/*LANG*/"none", /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
onchange: v => {
settings.suClr = v;
saveSettings();
}
},
/*LANG*/"Border": {
value: settings.calBrdr,
format: v => v ? "show" : "none",
onchange: v => {
settings.calBrdr = v;
saveSettings();
}
},
/*LANG*/"Today settings": () => {
showTodayMenu();
},
/*LANG*/"< Cancel": () => restoreAndExitSettings()
});
};
var showTodayMenu = () => {
E.showMenu({
"": {
"title": /*LANG*/"Today settings"
},
"< Back": () => showMainMenu(),
/*LANG*/"Color": {
value: settings.tdyNumClr,
min: 0, max: 3,
format: v => [/*LANG*/"none", /*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
onchange: v => {
settings.tdyNumClr = v;
saveSettings();
}
},
/*LANG*/"Marker": {
value: settings.tdyMrkr,
min: 0, max: 3,
format: v => [/*LANG*/"none", /*LANG*/"circle", /*LANG*/"rectangle", /*LANG*/"filled"][v],
onchange: v => {
settings.tdyMrkr = v;
saveSettings();
}
},
/*LANG*/"Mrk.Color": {
value: settings.tdyMrkClr,
min: 0, max: 2,
format: v => [/*LANG*/"red", /*LANG*/"green", /*LANG*/"blue"][v],
onchange: v => {
settings.tdyMrkClr = v;
saveSettings();
}
},
/*LANG*/"Mrk.Size": {
value: settings.tdyMrkPxl,
min: 0, max: 10,
format: v => v+"px",
onchange: v => {
settings.tdyMrkPxl = v;
saveSettings();
}
},
/*LANG*/"< Cancel": () => restoreAndExitSettings()
});
};
showMainMenu();
});