diff --git a/app.js b/app.js index 74a06f0..574f3f3 100644 --- a/app.js +++ b/app.js @@ -149,12 +149,7 @@ function Desks(inDesks) const attributes = {}; - attributes.class = latest ? Tag("PartGood") : Tag("PartEmpty"); - - if(scan.need_dirty.includes(index)) - { - attributes.class = drawDirtyAsCaution ? Tag("PartCaution") : Tag("PartDirty"); - } + attributes.class = scan.need_dirty.includes(index) ? Tag("PartDirty") : "" return DOM.td( Div.Part( @@ -190,17 +185,11 @@ function Desks(inDesks) } }; - attributes.class = latest ? Tag("PartGood") : Tag("PartEmpty"); + if( (desk.need.length==0 && !latest) || scan.make_dirty.includes(index)) + { + attributes.class = Tag("PartDirty") + } - if(scan.make_dirty.includes(index)) - { - attributes.class = drawDirtyAsCaution ? Tag("PartCaution") : Tag("PartDirty"); - } - if(desk.need.length == 0 && !latest) - { - attributes.class = Tag("PartDirty"); - } - return DOM.td( Div.Part( attributes, diff --git a/mock-user-folder/graph/room.js b/mock-user-folder/graph/room.js index 836ed69..dc19486 100644 --- a/mock-user-folder/graph/room.js +++ b/mock-user-folder/graph/room.js @@ -32,6 +32,9 @@ export default CreateAllRooms({ pass_01:["January"], pass_02:["February"], pass_03:["March"], + pass_04:["April"], + pass_05:["May"], + pass_06:["June"], } }) }); \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_01/u1.json b/mock-user-folder/store/room_01/pass_01/u1.json deleted file mode 100644 index 1eb3a30..0000000 --- a/mock-user-folder/store/room_01/pass_01/u1.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "p1": - [ - [123, "data"], - [456, "more data"], - [789, "even more data"], - [101112, "even more data"] - ] -} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_01/u2.json b/mock-user-folder/store/room_01/pass_01/u2.json deleted file mode 100644 index 2df184a..0000000 --- a/mock-user-folder/store/room_01/pass_01/u2.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "p2": - [ - [123, "data"], - [456, "more data"], - [789, "even more data"] - ] -} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_01/u4.json b/mock-user-folder/store/room_01/pass_01/u4.json new file mode 100644 index 0000000..136ff59 --- /dev/null +++ b/mock-user-folder/store/room_01/pass_01/u4.json @@ -0,0 +1,14 @@ +{ + "p1": [ + [ + 1762196165935, + "normal title" + ] + ], + "p2": [ + [ + 1762196173135, + "normal slug" + ] + ] +} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_01/u5.json b/mock-user-folder/store/room_01/pass_01/u5.json deleted file mode 100644 index b777230..0000000 --- a/mock-user-folder/store/room_01/pass_01/u5.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "p2": [ - [ - 1762186044460, - "le-slug" - ] - ] -} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_02/u1.json b/mock-user-folder/store/room_01/pass_02/u1.json index 839715b..e189b48 100644 --- a/mock-user-folder/store/room_01/pass_02/u1.json +++ b/mock-user-folder/store/room_01/pass_02/u1.json @@ -2,7 +2,7 @@ "p4": [ [ 1762193485093, - "proj01" + "Make made Late" ] ] } \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_02/u5.json b/mock-user-folder/store/room_01/pass_02/u5.json index f947370..d5080fd 100644 --- a/mock-user-folder/store/room_01/pass_02/u5.json +++ b/mock-user-folder/store/room_01/pass_02/u5.json @@ -2,7 +2,7 @@ "p1": [ [ 1762186057868, - "new post" + "Need made Early" ] ] } \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_03/u4.json b/mock-user-folder/store/room_01/pass_03/u4.json new file mode 100644 index 0000000..899612e --- /dev/null +++ b/mock-user-folder/store/room_01/pass_03/u4.json @@ -0,0 +1,14 @@ +{ + "p4": [ + [ + 1762196034794, + "Make made Early" + ] + ], + "p1": [ + [ + 1762196047017, + "Need made Late" + ] + ] +} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_04/u1.json b/mock-user-folder/store/room_01/pass_04/u1.json new file mode 100644 index 0000000..fdb840c --- /dev/null +++ b/mock-user-folder/store/room_01/pass_04/u1.json @@ -0,0 +1,14 @@ +{ + "p3": [ + [ + 1762196236384, + "complete 3" + ] + ], + "p4": [ + [ + 1762196245327, + "complete 4" + ] + ] +} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_04/u5.json b/mock-user-folder/store/room_01/pass_04/u5.json new file mode 100644 index 0000000..0121837 --- /dev/null +++ b/mock-user-folder/store/room_01/pass_04/u5.json @@ -0,0 +1,14 @@ +{ + "p1": [ + [ + 1762196209704, + "complete 1" + ] + ], + "p2": [ + [ + 1762196217319, + "complete 2" + ] + ] +} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_05/u1.json b/mock-user-folder/store/room_01/pass_05/u1.json new file mode 100644 index 0000000..a4f2645 --- /dev/null +++ b/mock-user-folder/store/room_01/pass_05/u1.json @@ -0,0 +1,18 @@ +{ + "p3": [ + [ + 1762196341950, + "complete 3" + ] + ], + "p4": [ + [ + 1762196348950, + "complete 4" + ], + [ + 1762196393702, + "complete Later" + ] + ] +} \ No newline at end of file diff --git a/mock-user-folder/store/room_01/pass_05/u5.json b/mock-user-folder/store/room_01/pass_05/u5.json new file mode 100644 index 0000000..f2ee9bc --- /dev/null +++ b/mock-user-folder/store/room_01/pass_05/u5.json @@ -0,0 +1,18 @@ +{ + "p1": [ + [ + 1762196328127, + "complete 1" + ] + ], + "p2": [ + [ + 1762196335342, + "complete 2" + ], + [ + 1762196363079, + "complete Late" + ] + ] +} \ No newline at end of file