Skip to content

Commit 7de1bd5

Browse files
aaronrs2002aaronrs2002
committed
mobile nav bug fix
1 parent 7509f5a commit 7de1bd5

File tree

3 files changed

+156
-31
lines changed

3 files changed

+156
-31
lines changed

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<span class="navbar-toggler-icon"></span>
7777
</button>
7878

79-
<div class="navbar-collapse collapse" data-toggle="mobileNav">
79+
<div class="navbar-collapse collapse">
8080
<ul class="navbar-nav me-auto mb-2 ml-5 mb-sm-0" id="navLinkTarget">
8181

8282

‎js/functionality.js‎

Lines changed: 149 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,14 @@ function handleOnSubmit(event, type, merge) {
483483

484484
if (type === "json") {
485485
console.log("WE GO PAST type: " + type);
486-
if (merge === "default") {
486+
if (merge === "default") {/*start upload not merge here*/
487+
488+
489+
490+
491+
492+
493+
487494
let currentTasksList = [];
488495
let taskObj = []
489496

@@ -546,40 +553,158 @@ function handleOnSubmit(event, type, merge) {
546553
localStorage.setItem("taskList", JSON.stringify(taskObj));
547554
convertForCalendar("merge");
548555
runTimeline();
549-
} else {
556+
} else { /*START MERGE OPTION*/
550557
console.log("WE GO PAST merge: " + merge);
551558

559+
let tempTasksObj = tempTasks.taskList;
552560

553561

554-
/*START MERGE OPTION*/
555-
let tempTasksObj = []
556-
if (!localStorage.getItem("taskList")) {
557562

558-
tempTasksObj = tempTasks.taskList;
559-
localStorage.setItem("taskList", JSON.stringify(tempTasks.taskList));
560-
} else {
563+
console.log(" JSON.stringify(tempTasksObj): " + JSON.stringify(tempTasksObj));
561564

565+
try {/*Start merge tasklist*/
566+
if (localStorage.getItem("taskList")) {
562567

563568

564-
try {
565-
if (JSON.parse(localStorage.getItem("taskList")).length > 0) {
566-
tempTasksObj = [...JSON.parse(localStorage.getItem("taskList")), ...tempTasks.taskList];
569+
let localTaskList = JSON.parse(localStorage.getItem("taskList"));
570+
let localTasks = []
571+
572+
for (let i = 0; i < localTaskList.length; i++) {
573+
console.log(" localTaskList[i].task: " + localTaskList[i].task);
574+
if (localTasks.indexOf(localTaskList[i].task) === -1) {
575+
localTasks.push(localTaskList[i].task)
576+
}
567577

568578
}
569-
} catch (error) {
570-
tempTasksObj.push(JSON.parse(localStorage.getItem("taskList")));
571-
if (tempTasksObj.length > 0) {
572-
tempTasksObj = [...tempTasksObj, ...tempTasks.taskList];
573579

574-
} else {
575-
tempTasksObj = tempTasks.taskList;
580+
for (let i = 0; i < tempTasksObj.length; i++) {
581+
console.log("tempTasksObj[i].task: " + tempTasksObj[i].task);
582+
if (localTasks.indexOf(tempTasksObj[i].task) === -1) {
583+
tempTasksObj.push(tempTasksObj[i]);
584+
}
585+
}
586+
} else {
587+
localStorage.setItem("taskList", JSON.stringify(tempTasksObj))
588+
}
589+
590+
//tempTasksObj = [...JSON.parse(localStorage.getItem("taskList")), ...tempTasks.taskList];
591+
592+
593+
} catch (error) {
594+
console.log("Error: " + error);
595+
console.log(" JSON.stringify(tempTasksObj): " + JSON.stringify(tempTasksObj));
596+
/* tempTasksObj.push(JSON.parse(localStorage.getItem("taskList")));
597+
if (tempTasksObj.length > 0) {
598+
tempTasksObj = [...tempTasksObj, ...tempTasks.taskList];
599+
600+
} else {
601+
tempTasksObj = tempTasks.taskList;
602+
603+
}*/
604+
605+
}
606+
localStorage.setItem("taskList", JSON.stringify(tempTasksObj));
607+
608+
/*END MERGE TASK LIST*/
609+
610+
611+
/*START HOURS MERGED */
612+
613+
try {
614+
615+
let timesIn = [];
616+
617+
for (let i = 0; i < localStorage.length; i++) {
618+
619+
620+
621+
const localKey = localStorage.key(i);
622+
623+
//aaron@web-presence.biz:merge hours json:timeClock
624+
625+
//for (let i = j; j < tempTasks.timeClock.length; i++) {
626+
//
627+
628+
//for (const key in tempTasks.timeClock) {
629+
for (const [key, value] of Object.entries(tempTasks.timeClock)) {
630+
console.log("key: " + key + " - localKey: " + localKey);
631+
if (key === localKey) {
632+
let currentHrs = JSON.parse(localStorage.getItem(localKey));
633+
for (let j = 0; j < currentHrs.length; j++) {
634+
timesIn.push(currentHrs[j].timeIn)
635+
636+
}
637+
for (let j = 0; j < tempTasks.timeClock.length; j++) {
638+
if (timesIn.indexOf(tempTasks.timeClock[j].timeIn) === -1) {
639+
currentHrs.push(tempTasks.timeClock[j]);
640+
}
641+
}
642+
localStorage.setItem(localKey, JSON.stringify(currentHrs));
643+
} else {
644+
console.log("we just replace the hours key: " + key)
645+
localStorage.setItem(key, JSON.stringify(value))
646+
}
576647

577648
}
649+
}
650+
/* for (let j = 0; j < tempTaskList.length; j++) {
651+
const key = localStorage.key(i);
652+
653+
654+
if (key.indexOf(":timeClock") !== -1) {
655+
656+
if (keyListArr.indexOf(key) === -1) {
657+
savedHours.push({ [key]: JSON.parse(localStorage.getItem(key)) });
658+
keyListArr.push(key);
659+
}
660+
661+
662+
}
663+
664+
}*/
665+
666+
667+
668+
669+
} catch (error) {
670+
console.log("error: " + error);
671+
672+
}
673+
674+
675+
676+
/*END HOURS MERGED*/
677+
678+
679+
578680

681+
682+
/*start invoices merge*/
683+
684+
let currentInvoices = [];
685+
let invoiceDomains = [];
686+
if (localStorage.getItem("invoices")) {
687+
currentInvoices = JSON.parse(localStorage.getItem("invoices"));
688+
for (let i = 0; i < currentInvoices.length; i++) {
689+
if (invoiceDomains.indexOf(currentInvoices[i].domain) === -1) {
690+
invoiceDomains.push(currentInvoices[i].domain);
691+
}
692+
}
693+
694+
for (let i = 0; i < tempTasks.invoices.length; i++) {
695+
if (invoiceDomains.indexOf(tempTasks.invoices[i].domain) === -1) {
696+
currentInvoices.push(tempTasks.invoices[i])
697+
}
579698
}
580-
localStorage.setItem("taskList", JSON.stringify(tempTasksObj));
699+
700+
localStorage.setItem("invoices", JSON.stringify(currentInvoices));
581701
}
582702

703+
/*end invoices merge*/
704+
705+
706+
707+
583708
buildList(tempTasksObj, 0);
584709
loadList(tempTasksObj);
585710
runTimeline();
@@ -600,7 +725,7 @@ function handleOnSubmit(event, type, merge) {
600725
} else {
601726
localStorage.setItem(tempTitle, tempTasks.budget[i]);
602727
}
603-
728+
604729
}*/
605730
try {
606731
let tempBugetObjArr = [];
@@ -669,17 +794,17 @@ if (localStorage.getItem("taskList")) {
669794

670795
console.log("JSON.stringify(tempTaskList): " + JSON.stringify(tempTaskList) + " - localStorage.length: " + localStorage.length)
671796

672-
797+
/*
673798
if (localStorage.getItem("taskList")) {
674799
for (let i = 0; i < localStorage.length; i++) {
675800
for (let j = 0; j < tempTaskList.length; j++) {
676801
const key = localStorage.key(i);
677802
678-
803+
console.log("localStorage.key(i): " + localStorage.key(i))
679804
if (key.indexOf(":timeClock") !== -1) {
680-
805+
let exisitngHrs = JSON.parse(localStorage.getItem(localStorage.key(i)));
681806
if (keyListArr.indexOf(key) === -1) {
682-
savedHours.push({ [key]: JSON.parse(localStorage.getItem(key)) });
807+
savedHours.push({ [localStorage.key(i)]: exisitngHrs });
683808
keyListArr.push(key);
684809
}
685810
@@ -692,7 +817,7 @@ if (localStorage.getItem("taskList")) {
692817
}
693818
for (let i = 0; i < savedHours.length; i++) {
694819
localStorage.setItem(keyListArr[i], JSON.stringify(savedHours[i].keyListArr[i].keyListArr[0]));
695-
}
820+
}*/
696821

697822

698823

‎js/sharedFunctionality.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ const timeStamp = () => {
5252

5353
const toggleMobileNav = (whichElem) => {
5454

55-
if (whichElem === "mobileNav") {
56-
if (document.querySelector(".collapse[data-toggle='mobileNav']")) {
57-
document.querySelector("[data-toggle='mobileNav']").classList.remove("collapse");
58-
document.querySelector("[data-toggle='mobileNav']").classList.add("show");
55+
if (whichElem === "mobileNav") {//navbar-collapse collapse
56+
if (document.querySelector(".collapse.navbar-collapse")) {
57+
document.querySelector(".navbar-collapse").classList.remove("collapse");
58+
document.querySelector(".navbar-collapse").classList.add("show");
5959
} else {
60-
document.querySelector("[data-toggle='mobileNav']").classList.remove("show");
61-
document.querySelector("[data-toggle='mobileNav']").classList.add("collapse");
60+
document.querySelector(".navbar-collapse").classList.remove("show");
61+
document.querySelector(".navbar-collapse").classList.add("collapse");
6262
}
6363

6464
}

0 commit comments

Comments
 (0)