From 1f175ecd9fa0662ac042f1fbbf59d9cef0f4da10 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:11:56 +0200
Subject: [PATCH 01/16] Create app.js

---
 apps/homework/app.js | 238 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 apps/homework/app.js

diff --git a/apps/homework/app.js b/apps/homework/app.js
new file mode 100644
index 000000000..032560ec5
--- /dev/null
+++ b/apps/homework/app.js
@@ -0,0 +1,238 @@
+var Layout = require("Layout");
+
+var homework = require("Storage").readJSON("homework.txt", "r");
+//var hwfile = require("Storage").open("homework.txt", "w");
+var mainCheckHomeworkMenu;
+console.log(homework);
+//subjects = require("Storage").open("subjects.txt", "r");
+
+var mode = "mainmenu";
+var statusmsg;
+var mainMenu = {
+  "": {
+    title: "--Main Menu--"
+  },
+  "New Homework": function() {
+    E.showMenu(nhwmn);
+    mode = "newhomework";
+  },
+  "Check Homework": function() {
+    checkUnfinishedHomeworkAssembler();
+  },
+  "Reset Homework": function() {
+    E.showPrompt("Are you sure you want to delete homework.txt?", {
+      buttons: {
+        "No": false,
+        "Yes": true
+      }
+    }).then(function(v) {
+      if (v) {
+        require("Storage").write("homework.txt", '{"homework":[]}');
+        homework = require("Storage").readJSON("homework.txt", "r");
+        E.showMenu(mainMenu);
+
+      }else{
+      E.showMenu(mainMenu);
+      }
+    });
+  },
+};
+
+
+var nhwmn = { // New homework Menu
+  "": {
+    "title": "New HW Subject:"
+  },
+  "German": function() {
+    addNewHomework("German");
+  },
+  "English": function() {
+    addNewHomework("English");
+  },
+  "Maths": function() {
+    addNewHomework("Maths");
+  },
+  "French": function() {
+    addNewHomework("French");
+  },
+  "Chemistry": function() {
+    addNewHomework("Chemistry");
+  },
+  "Physics": function() {
+    addNewHomework("Physics");
+  },
+  "Religion": function() {
+    addNewHomework("Religion");
+  },
+  "Biology": function() {
+    addNewHomework("Biology");
+  },
+  "Music": function() {
+    addNewHomework("Music");
+  },
+  "History": function() {
+    addNewHomework("History");
+  },
+  "Arts": function() {
+    addNewHomework("Arts");
+  },
+  "Sports": function() {
+    addNewHomework("Sports");
+  },
+
+  "Back": function() {
+    mode = "mainmenu";
+    E.showMenu(mainMenu);
+  },
+
+
+};
+
+
+function checkUnfinishedHomeworkAssembler() {
+  homework = require("Storage").readJSON("homework.txt", "r");
+  var hwcount = Object.keys(homework.homework).length;
+  mainCheckHomeworkMenu = {
+    '': {
+      'title': 'Unfinished HW:'
+    }
+  };
+  // This code snippet gets the unfinished HW and puts it in mainCheckHomeworkMenu
+  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function (currently being written)
+  for (var i = 0; i < hwcount; ++i) {
+    if (homework.homework[i].done === false) {
+      var currentsubject = i; //attempting to pass i
+      mainCheckHomeworkMenu[homework.homework[i].subject] = function() {
+        checkPreciseHomework(currentsubject);
+      };
+    }
+
+  }
+  mainCheckHomeworkMenu["See Archived HW"] = function() {
+    checkFinishedHomeworkAssembler();
+  };
+  mainCheckHomeworkMenu["Back to Main Menu"] = function() {
+    mode = "mainmenu";
+    E.showMenu(mainMenu);
+  };
+  E.showMenu(mainCheckHomeworkMenu);
+}
+
+function checkFinishedHomeworkAssembler() {
+  homework = require("Storage").readJSON("homework.txt", "r");
+  var hwcount = Object.keys(homework.homework).length;
+  mainCheckHomeworkMenu = {
+    '': {
+      'title': 'Unfinished HW:'
+    }
+  };
+  // This code snippet gets the unfinished HW and puts it in mainCheckHomeworkMenu
+  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function (currently being written)
+  for (var i = 0; i < hwcount; ++i) {
+    if (homework.homework[i].done === true) {
+      var currentsubject = i; //attempting to pass i
+      mainCheckHomeworkMenu[homework.homework[i].subject] = function() {
+        checkPreciseHomework(currentsubject);
+      };
+    }
+
+  }
+  mainCheckHomeworkMenu["Back"] = function() {
+    mode = "mainmenu";
+    E.showMenu(mainMenu);
+  };
+  E.showMenu(mainCheckHomeworkMenu);
+}
+
+function checkPreciseHomework(subjectnum) { // P A I N
+  homework = require("Storage").read("homework.txt", "r");
+  homework = JSON.parse(homework);
+  var subject = homework.homework[subjectnum].subject;
+  var task = homework.homework[subjectnum].task;
+  var taskmsg = "Task: " + homework.homework[subjectnum].task;
+  if (homework.homework[subjectnum].done === false) {
+    statusmsg = "Status: Unfinished";
+  } else {
+    statusmsg = "Status: Finished";
+  }
+  var datetimerecieved = homework.homework[subjectnum].datetimerecievehw;
+  var datetimerecievedmsg = "Recieved: " + homework.homework[subjectnum].datetimerecievehw;
+  var checkPreciseHomeworkMenu = {
+    '': {
+      'title': subject
+    },
+  };
+  checkPreciseHomeworkMenu[subject] = function() {},
+    checkPreciseHomeworkMenu[taskmsg] = function() {},
+    checkPreciseHomeworkMenu[statusmsg] = function() {
+      status = "Status: Finished";
+      var d = new Date();
+      var currenttime = require("locale").time(d, 1);
+      var currentdate = require("locale").date(d);
+      var datetime = (currenttime + " " + currentdate);
+      delete homework.homework[subjectnum];
+      homework.homework.push({
+        subject: subject,
+        task: task,
+        done: true,
+        datetimerecievehw: datetimerecieved,
+        datetimehwdone: datetime
+      });
+      require("Storage").write("homework.txt", JSON.stringify(homework));
+      checkUnfinishedHomeworkAssembler();
+    },
+    checkPreciseHomeworkMenu[datetimerecievedmsg] = function() {},
+    checkPreciseHomeworkMenu["Back"] = function() {
+      checkUnfinishedHomeworkAssembler();
+    },
+
+    E.showMenu(checkPreciseHomeworkMenu);
+
+
+}
+
+function pushHomework(subject, status, datetimehwdone) {
+  homework = require("Storage").readJSON("homework.txt", "r");
+
+}
+
+function addNewHomework(subject) { // Pass subject
+  require("textinput").input().then(result => {
+    if (result === "") {
+      mode = "newhomework";
+      E.showMenu(nhwmn);
+    } else {
+      var d = new Date();
+      // update time and date
+      var currenttime = require("locale").time(d, 1);
+      var currentdate = require("locale").date(d);
+      var datetime = (currenttime + " " + currentdate);
+      homework.homework.push({
+        subject: subject,
+        task: result,
+        done: false,
+        datetimerecievehw: datetime
+      }); // TODO: when HW is done, add datetimeendhw !!!
+      //homework.homework[subject] = result;
+      require("Storage").write("homework.txt", JSON.stringify(homework));
+      E.showMenu(mainMenu);
+
+    }
+  });
+
+}
+
+function main() { // why does this still exist
+  if (mode === "mainmenu") {
+    E.showMenu(mainMenu);
+
+  } else if (mode === "newhomework") {
+    E.showMenu(nhwmn);
+
+  }
+}
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+main();
+//loop = setInterval(main, 1);

From a6cdee8a40ac6348f8e7b9361025f1d20a283da9 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:16:41 +0200
Subject: [PATCH 02/16] Create app-icon.js

---
 apps/homework/app-icon.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/homework/app-icon.js

diff --git a/apps/homework/app-icon.js b/apps/homework/app-icon.js
new file mode 100644
index 000000000..7eeb41f50
--- /dev/null
+++ b/apps/homework/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4cA///43hg3ytVN/UF61hsvR2kEKf4AzgMgCJ9JkmACBsSCIOSCBkEyQRCpBELBwIRCpJKKEAYmDJRBEFJRQdHJRBEDIIgIIhJlIFgYRGKBQRFIgMN23YOgwREHYQRHJQIFDhADCCI5KBIA4RIAAsW7doCIsf5LHGCNMbkmQRwIRhGpy6BCMI1RCP4R9UITXOCKJZvAH4AoA="))

From bd69f2136195b99bb3ac4d96f92b354063995e93 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:22:52 +0200
Subject: [PATCH 03/16] Create metadata.json

---
 apps/homework/metadata.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 apps/homework/metadata.json

diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json
new file mode 100644
index 000000000..a8f7909ea
--- /dev/null
+++ b/apps/homework/metadata.json
@@ -0,0 +1,15 @@
+
+{ "id": "homework",
+  "name": "Homework",
+  "shortName":"Homwork",
+  "version":"0.1",
+  "description": "A simple app to manage homework",
+  "icon": "app-icon.js",
+  "tags": "tool",
+  "supports" : ["BANGLEJS2"],  
+  "readme": "README.md",
+  "storage": [
+    {"name":"homework.app.js","url":"app.js"},
+    {"name":"homework.img","url":"app-icon.js","evaluate":true}
+  ]
+}

From 35f7f3d630fbba02b78efdbd6ddaa1ed454f224e Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:44:38 +0200
Subject: [PATCH 04/16] Create README.md

---
 apps/homework/README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 apps/homework/README.md

diff --git a/apps/homework/README.md b/apps/homework/README.md
new file mode 100644
index 000000000..adad4ef39
--- /dev/null
+++ b/apps/homework/README.md
@@ -0,0 +1,4 @@
+# This is a simple homework app
+Use the touchscreen to navigate.
+
+Requires the "textinput" library. (Tap keyboard)

From 558f219ccf99796bf0e779395996bc353de9045e Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:47:25 +0200
Subject: [PATCH 05/16] Update app-icon.js

---
 apps/homework/app-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/app-icon.js b/apps/homework/app-icon.js
index 7eeb41f50..7fe731b3a 100644
--- a/apps/homework/app-icon.js
+++ b/apps/homework/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4cA///43hg3ytVN/UF61hsvR2kEKf4AzgMgCJ9JkmACBsSCIOSCBkEyQRCpBELBwIRCpJKKEAYmDJRBEFJRQdHJRBEDIIgIIhJlIFgYRGKBQRFIgMN23YOgwREHYQRHJQIFDhADCCI5KBIA4RIAAsW7doCIsf5LHGCNMbkmQRwIRhGpy6BCMI1RCP4R9UITXOCKJZvAH4AoA="))
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A/AG27y4ttAAYttGM4tJGMYsMGMCJLSsIhPGLodTGLIYI3ZFhFxQtOJJgURFqQxKCR4tGm83nAACGKQQNLZAvTGIjWMBRIvVERgAMFYOHAAQcWABUtltSAAQvRisVjgACF7KPPF/4AHrFYvgACF5OXy+7AAQHBFYNkAAQv/R6IvHX8/C4XJAAQv/R/4v/F/4v/F/4v/ABNYrF8AAQHBFYOHAAQHB4XC5IACA4IrBsgACF/6//F/4vRAH4A/AH4A/ACwA=="))

From f69cd6e5ef91a16e07e303c174927116c06527ed Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:49:53 +0200
Subject: [PATCH 06/16] Add files via upload

---
 apps/homework/app.png | Bin 0 -> 684 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/homework/app.png

diff --git a/apps/homework/app.png b/apps/homework/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6174d46bfdb46eaa36f1f742ff1c8fd390efc04
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0%1u+K~!jg?U%ue(?Ar5f0Gpy)RTpZO@($5FT2)*sZCuxt%%Tqg8z)R
z+Fj7ASMla;FM<o(i{R=aBx%zM;(C+SgRQ5%c=KYOhqh=^lbNJbL)rOGW#;A0`#O`!
z44_ab6lucdm3UY&))~WN0-Ydek8+Otf&nCZ9O(jo3P;)BLm%fMB26H?@E~$UW)=`H
zJct~T!~z4eTw|aXfGbIJjOi2DrtY}yBoD_Hi1ClV_CO7IOFx%1uSvk&=<$-xh_FE1
z!t+kw{kw6nRxWA3s3BW~D-f%2@|yY1`)*W_Y?06eG1mAi(zFfT>UKDB{`}XjR+#5)
z0JzBsjeJK!1%{@<n?B1UYUVrrJx*LCW03}cT2x%l>HV|TV+qEzNYftZR`+d!XQvp?
zTzyb2n~dl_I3hvf2w23}L)~`Y1Uo8E)(8MHg^aJgeP>&ElhAF~0Z<>BMisz42#SaZ
zgcd#za!$`i43SU)2JC^Mb<Xa+lU$<^6Or##<2neNVR2H<LbaE-2>^_<{tc^THs^NQ
zognlM+_?Ch0HAm#>uY~z-;z_{)2-2tcVX4vzP`fEpJW%B;_&Ms0HBAyjC8Tk{`-iM
z5t;$>auEQKJ%7^QVT%p2Un&s*6f(zs?WcC#(GnRioqFc9uYX4%_tBUE=ff8OK=E6a
z6Pb|D`v8C)ta1XUk@6DrSXo{k{is~>ckH^;!7(`+OK4U;9UK4v3O@$Yb1(c1D1o$5
z0%@ZJ(niW*ZgLk6UTE6b1|aYyR);wbyu%#tLc{$M&v2Mq_!(Gu0fj=LNSEI_v-0fT
SL+0E70000<MNUMnLSTZtl|JeK

literal 0
HcmV?d00001


From 071c455565f7a8e59565809b5c9b12378e175c37 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:50:21 +0200
Subject: [PATCH 07/16] Update metadata.json

---
 apps/homework/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json
index a8f7909ea..a6f9b1207 100644
--- a/apps/homework/metadata.json
+++ b/apps/homework/metadata.json
@@ -4,7 +4,7 @@
   "shortName":"Homwork",
   "version":"0.1",
   "description": "A simple app to manage homework",
-  "icon": "app-icon.js",
+  "icon": "app.png",
   "tags": "tool",
   "supports" : ["BANGLEJS2"],  
   "readme": "README.md",

From 831a8635bf97467019d2452332fd480abddd2e57 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:52:54 +0200
Subject: [PATCH 08/16] Update app-icon.js

---
 apps/homework/app-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/app-icon.js b/apps/homework/app-icon.js
index 7fe731b3a..7dab2103b 100644
--- a/apps/homework/app-icon.js
+++ b/apps/homework/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A/AG27y4ttAAYttGM4tJGMYsMGMCJLSsIhPGLodTGLIYI3ZFhFxQtOJJgURFqQxKCR4tGm83nAACGKQQNLZAvTGIjWMBRIvVERgAMFYOHAAQcWABUtltSAAQvRisVjgACF7KPPF/4AHrFYvgACF5OXy+7AAQHBFYNkAAQv/R6IvHX8/C4XJAAQv/R/4v/F/4v/F/4v/ABNYrF8AAQHBFYOHAAQHB4XC5IACA4IrBsgACF/6//F/4vRAH4A/AH4A/ACwA=="))
+require("heatshrink").decompress(atob("mEwhH+AH4A/AH4A/AGu7y4ttAAYttGM4tJGMYsMGMCJLSsIhPGLodTGLIYI3ZFhFxQtOJJgURFqQxKCR4tGm83nAACGKQQNLZAvTGIjWMBRIvVERgAMFYOHAAQcWABUtltSAAQvRisVjgACF7KPPF/4AHrFYvgACF5OXy+7AAQHBFYNkAAQv/R6IvHX8/C4XJAAQv/R/4v/F/4v/F/4v/ABNYrF8AAQHBFYOHAAQHB4XC5IACA4IrBsgACF/6//F/4vRAH4A/AH4A/ACwA=="))

From afbaf2b90e08a0f0bcefc27e725e89ef278cf190 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 10:56:27 +0200
Subject: [PATCH 09/16] Update app-icon.js

---
 apps/homework/app-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/app-icon.js b/apps/homework/app-icon.js
index 7dab2103b..23a974ef3 100644
--- a/apps/homework/app-icon.js
+++ b/apps/homework/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwhH+AH4A/AH4A/AGu7y4ttAAYttGM4tJGMYsMGMCJLSsIhPGLodTGLIYI3ZFhFxQtOJJgURFqQxKCR4tGm83nAACGKQQNLZAvTGIjWMBRIvVERgAMFYOHAAQcWABUtltSAAQvRisVjgACF7KPPF/4AHrFYvgACF5OXy+7AAQHBFYNkAAQv/R6IvHX8/C4XJAAQv/R/4v/F/4v/F/4v/ABNYrF8AAQHBFYOHAAQHB4XC5IACA4IrBsgACF/6//F/4vRAH4A/AH4A/ACwA=="))
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4AVvNPp95F1tPqujF9IuCvPO5wspAAXHF84uFp4uBL84xEvPN5q+rqtiCBl6F7tiAAY9LvQDBF86cDvQvCGLYvEGAr7EF4IwDF7c4GQwuERwIACqpecrlcF4lWLw4ACF7s3F58rGDIvEA4VcFwtWL4ovSCwwvHFoiOHGCQXHXYdcBwQuIDIwsMI5QwEGIKNERgh6JFpIuKAAOAGIYvCqpYJAwUyFxaNIGAovEXBheOF5pfCrl6RYjoTVAYvMRwYOKF76NDwAveGBaNEF8AwLFzgvHeRovoqtWFxtVDQbwSF44KBqouLDYzAYqz8OPg5gSD6K9FGCIvJVoIdLdoxgUDop9NF7gcEPZwvZJgwvnbiwTHF54bLMCEsAAIvVTRBEOF7zBSF7StPGDB1HPpyMVDAgZFbxztWAH4A/AGw"))

From 38475eaa1191ed5c7ce2a384b8290481825b5f46 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 11:06:26 +0200
Subject: [PATCH 10/16] attempting to properly display app image

---
 apps/homework/app-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/app-icon.js b/apps/homework/app-icon.js
index 23a974ef3..202b52b09 100644
--- a/apps/homework/app-icon.js
+++ b/apps/homework/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwxH+AH4A/AH4AVvNPp95F1tPqujF9IuCvPO5wspAAXHF84uFp4uBL84xEvPN5q+rqtiCBl6F7tiAAY9LvQDBF86cDvQvCGLYvEGAr7EF4IwDF7c4GQwuERwIACqpecrlcF4lWLw4ACF7s3F58rGDIvEA4VcFwtWL4ovSCwwvHFoiOHGCQXHXYdcBwQuIDIwsMI5QwEGIKNERgh6JFpIuKAAOAGIYvCqpYJAwUyFxaNIGAovEXBheOF5pfCrl6RYjoTVAYvMRwYOKF76NDwAveGBaNEF8AwLFzgvHeRovoqtWFxtVDQbwSF44KBqouLDYzAYqz8OPg5gSD6K9FGCIvJVoIdLdoxgUDop9NF7gcEPZwvZJgwvnbiwTHF54bLMCEsAAIvVTRBEOF7zBSF7StPGDB1HPpyMVDAgZFbxztWAH4A/AGw"))
+require("heatshrink").decompress(atob("mEwwhC/AH4AbhvQCyvd7oYTCwQYTCwgYRCwwYPIgpKQCA4YOBxIYMBhYLLHhgYEC5BsKDAYXHCwUBiUikAYIC4wtDC5IYCA4pEEC5QYBYRUCkQXJAA8K1Wq0AXHhGIxGAC5ZHHC8ZDDC4cM5qaBC8ZHHC68N6czmAXrL94X/C/4XHgUiCYIDDa54XXO/4XHAH4A/ABY="))

From bd7d5cf7e4928e683e04b3b34c6b7e024ff53c9b Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 11:12:19 +0200
Subject: [PATCH 11/16] Update metadata.json

---
 apps/homework/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json
index a6f9b1207..07279c4ea 100644
--- a/apps/homework/metadata.json
+++ b/apps/homework/metadata.json
@@ -1,7 +1,7 @@
 
 { "id": "homework",
   "name": "Homework",
-  "shortName":"Homwork",
+  "shortName":"Homework",
   "version":"0.1",
   "description": "A simple app to manage homework",
   "icon": "app.png",

From f0a7ea0ee97f58f83a045a24f21a546aac95303d Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 12:29:11 +0200
Subject: [PATCH 12/16] Update app.js

---
 apps/homework/app.js | 104 ++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 65 deletions(-)

diff --git a/apps/homework/app.js b/apps/homework/app.js
index 032560ec5..c7e04ba9f 100644
--- a/apps/homework/app.js
+++ b/apps/homework/app.js
@@ -1,11 +1,35 @@
 var Layout = require("Layout");
 
 var homework = require("Storage").readJSON("homework.txt", "r");
-//var hwfile = require("Storage").open("homework.txt", "w");
 var mainCheckHomeworkMenu;
-console.log(homework);
-//subjects = require("Storage").open("subjects.txt", "r");
 
+var nhwmn = { // New homework Menu
+  "": {
+    "title": "New HW Subject:"
+  }
+
+};
+
+
+
+function newHomeworkMenu() {
+  E.showMessage("Getting subjects...");
+  var rawsubjects = require("Storage").read("subjects.txt"); // This code reads out the subjects list and removes the newline character at the end
+  var splitsubjects = rawsubjects.split(",");
+  var lastItem = splitsubjects[splitsubjects.length - 1];
+  var thiscurrentsubject;
+  var command;
+  lastItem = lastItem.slice(0, -1);
+  splitsubjects[splitsubjects.length - 1] = lastItem;
+  for (let i = 0; i < splitsubjects.length; i++) { // loop through array and add to menu
+    thiscurrentsubject = splitsubjects[i];
+    command = addNewHomework(thiscurrentsubject);
+    nhwmn[splitsubjects[i]] = addNewHomework.bind(null, thiscurrentsubject);
+  }
+  nhwmn["Back"] = function() {E.showMenu(mainMenu);};
+  console.log(nhwmn);
+  E.showMenu(nhwmn);
+}
 var mode = "mainmenu";
 var statusmsg;
 var mainMenu = {
@@ -13,7 +37,7 @@ var mainMenu = {
     title: "--Main Menu--"
   },
   "New Homework": function() {
-    E.showMenu(nhwmn);
+    newHomeworkMenu();
     mode = "newhomework";
   },
   "Check Homework": function() {
@@ -38,73 +62,20 @@ var mainMenu = {
   },
 };
 
-
-var nhwmn = { // New homework Menu
-  "": {
-    "title": "New HW Subject:"
-  },
-  "German": function() {
-    addNewHomework("German");
-  },
-  "English": function() {
-    addNewHomework("English");
-  },
-  "Maths": function() {
-    addNewHomework("Maths");
-  },
-  "French": function() {
-    addNewHomework("French");
-  },
-  "Chemistry": function() {
-    addNewHomework("Chemistry");
-  },
-  "Physics": function() {
-    addNewHomework("Physics");
-  },
-  "Religion": function() {
-    addNewHomework("Religion");
-  },
-  "Biology": function() {
-    addNewHomework("Biology");
-  },
-  "Music": function() {
-    addNewHomework("Music");
-  },
-  "History": function() {
-    addNewHomework("History");
-  },
-  "Arts": function() {
-    addNewHomework("Arts");
-  },
-  "Sports": function() {
-    addNewHomework("Sports");
-  },
-
-  "Back": function() {
-    mode = "mainmenu";
-    E.showMenu(mainMenu);
-  },
-
-
-};
-
-
 function checkUnfinishedHomeworkAssembler() {
   homework = require("Storage").readJSON("homework.txt", "r");
   var hwcount = Object.keys(homework.homework).length;
   mainCheckHomeworkMenu = {
     '': {
-      'title': 'Unfinished HW:'
+      'title': 'Archived HW:'
     }
   };
   // This code snippet gets the unfinished HW and puts it in mainCheckHomeworkMenu
-  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function (currently being written)
+  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function 
   for (var i = 0; i < hwcount; ++i) {
     if (homework.homework[i].done === false) {
       var currentsubject = i; //attempting to pass i
-      mainCheckHomeworkMenu[homework.homework[i].subject] = function() {
-        checkPreciseHomework(currentsubject);
-      };
+      mainCheckHomeworkMenu[homework.homework[i].subject] = checkPreciseHomework.bind(null, currentsubject);
     }
 
   }
@@ -115,6 +86,7 @@ function checkUnfinishedHomeworkAssembler() {
     mode = "mainmenu";
     E.showMenu(mainMenu);
   };
+  console.log(mainCheckHomeworkMenu);
   E.showMenu(mainCheckHomeworkMenu);
 }
 
@@ -126,14 +98,13 @@ function checkFinishedHomeworkAssembler() {
       'title': 'Unfinished HW:'
     }
   };
+
   // This code snippet gets the unfinished HW and puts it in mainCheckHomeworkMenu
   // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function (currently being written)
   for (var i = 0; i < hwcount; ++i) {
     if (homework.homework[i].done === true) {
       var currentsubject = i; //attempting to pass i
-      mainCheckHomeworkMenu[homework.homework[i].subject] = function() {
-        checkPreciseHomework(currentsubject);
-      };
+      mainCheckHomeworkMenu[homework.homework[i].subject] = checkPreciseHomework.bind(null, currentsubject);
     }
 
   }
@@ -197,10 +168,11 @@ function pushHomework(subject, status, datetimehwdone) {
 }
 
 function addNewHomework(subject) { // Pass subject
+  console.log(subject);
   require("textinput").input().then(result => {
     if (result === "") {
       mode = "newhomework";
-      E.showMenu(nhwmn);
+      newHomeworkMenu();
     } else {
       var d = new Date();
       // update time and date
@@ -213,6 +185,8 @@ function addNewHomework(subject) { // Pass subject
         done: false,
         datetimerecievehw: datetime
       }); // TODO: when HW is done, add datetimeendhw !!!
+      console.log("subject is" + subject);
+
       //homework.homework[subject] = result;
       require("Storage").write("homework.txt", JSON.stringify(homework));
       E.showMenu(mainMenu);
@@ -227,7 +201,7 @@ function main() { // why does this still exist
     E.showMenu(mainMenu);
 
   } else if (mode === "newhomework") {
-    E.showMenu(nhwmn);
+    newHomeworkMenu()
 
   }
 }

From 1f7178150afdd14feb8341557effaaca6648665c Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 14:22:01 +0200
Subject: [PATCH 13/16] Add files via upload

---
 apps/homework/subjects.html | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 apps/homework/subjects.html

diff --git a/apps/homework/subjects.html b/apps/homework/subjects.html
new file mode 100644
index 000000000..622719e2d
--- /dev/null
+++ b/apps/homework/subjects.html
@@ -0,0 +1,30 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+  </head>
+  <body>
+
+    <p>Subjects: <input type="text" id="subjects" class="form-input" value="eg. German,Maths,Geography,..."></p>
+    <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
+
+    <script src="../../core/lib/customize.js"></script>
+
+    <script>
+      // When the 'upload' button is clicked...
+      document.getElementById("upload").addEventListener("click", function() {
+        // get the text to add
+        var text = document.getElementById("subjects").value;
+        console.log(text);
+        // build the app's text using a templated String
+        var app = text;
+        // send finished app (in addition to contents of app.json)
+        sendCustomizedApp({
+          storage:[
+            {name:"subjects.txt"},
+          ]
+        });
+      });
+
+    </script>
+  </body>
+</html>

From 27d63037837b9c7d9478d491b5d5d96b1e4dffe2 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 14:23:13 +0200
Subject: [PATCH 14/16] Update metadata.json

---
 apps/homework/metadata.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json
index 07279c4ea..2ba1e918f 100644
--- a/apps/homework/metadata.json
+++ b/apps/homework/metadata.json
@@ -8,6 +8,7 @@
   "tags": "tool",
   "supports" : ["BANGLEJS2"],  
   "readme": "README.md",
+  "custom": "subjects.html",
   "storage": [
     {"name":"homework.app.js","url":"app.js"},
     {"name":"homework.img","url":"app-icon.js","evaluate":true}

From 60f4cd8f9d3b4f4dc645e5d6d8c5713bc79cb2c6 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 14:26:51 +0200
Subject: [PATCH 15/16] Update app.js

---
 apps/homework/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/homework/app.js b/apps/homework/app.js
index c7e04ba9f..4ba786690 100644
--- a/apps/homework/app.js
+++ b/apps/homework/app.js
@@ -67,11 +67,11 @@ function checkUnfinishedHomeworkAssembler() {
   var hwcount = Object.keys(homework.homework).length;
   mainCheckHomeworkMenu = {
     '': {
-      'title': 'Archived HW:'
+      'title': 'Unfinished HW:'
     }
   };
   // This code snippet gets the unfinished HW and puts it in mainCheckHomeworkMenu
-  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function 
+  // btw mainCheckHomeworkMenu displays all the homework, when tapping on it you get more details with checkPreciseHomework function
   for (var i = 0; i < hwcount; ++i) {
     if (homework.homework[i].done === false) {
       var currentsubject = i; //attempting to pass i
@@ -95,7 +95,7 @@ function checkFinishedHomeworkAssembler() {
   var hwcount = Object.keys(homework.homework).length;
   mainCheckHomeworkMenu = {
     '': {
-      'title': 'Unfinished HW:'
+      'title': 'Archived HW:'
     }
   };
 

From a1335bfe225419154009a4dcd5f7107fe59465e9 Mon Sep 17 00:00:00 2001
From: JuliusS123 <42714028+JuliusS123@users.noreply.github.com>
Date: Sun, 15 May 2022 14:29:17 +0200
Subject: [PATCH 16/16] Update subjects.html

---
 apps/homework/subjects.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/homework/subjects.html b/apps/homework/subjects.html
index 622719e2d..d3bf7a400 100644
--- a/apps/homework/subjects.html
+++ b/apps/homework/subjects.html
@@ -4,7 +4,7 @@
   </head>
   <body>
 
-    <p>Subjects: <input type="text" id="subjects" class="form-input" value="eg. German,Maths,Geography,..."></p>
+    <p>Subjects: <input type="text" id="subjects" class="form-input" value="Seperate subjects by comma, eg. German,Maths,Geography,..."></p>
     <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
 
     <script src="../../core/lib/customize.js"></script>