From 875457953f6e50bd5a1612656ca697667b1b21cd Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Wed, 20 Dec 2017 17:23:39 -0700 Subject: [PATCH] Lots of things Add QC shifts, add proper icon, check for app permissions, adjust styles, fix UI bugs, prepare login UI for quick access mode --- assets/css/other.css | 19 +++++++++++++ assets/img/logo_64.png | Bin 2794 -> 1014 bytes cards/js/qwikclock_myshifts.js | 41 +++++++++++++++++++++++++++++ cards/js/qwikclock_punchinout.js | 14 ++++++++++ cards/js/taskfloor_viewmessages.js | 7 +++-- cards/js/taskfloor_viewtasks.js | 7 +++-- cards/qwikclock_myshifts.html | 9 +++++++ cards/taskfloor_viewmessages.html | 6 ++--- cards/taskfloor_viewtasks.html | 6 ++--- index.html | 11 ++++---- js/functions.js | 2 +- js/home.js | 14 ++++++++-- main.js | 3 +-- pages/login.html | 36 ++++++++++++++++++++++++- 14 files changed, 151 insertions(+), 24 deletions(-) create mode 100644 cards/js/qwikclock_myshifts.js create mode 100644 cards/qwikclock_myshifts.html diff --git a/assets/css/other.css b/assets/css/other.css index 92d14c5..682dc2a 100644 --- a/assets/css/other.css +++ b/assets/css/other.css @@ -6,4 +6,23 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. #card-box .col { padding: 15px; +} + +#userlist .row { + overflow-y: auto; + + /* + 160px obtained from trial-and-error adjustments, if the login screen + is changed, this might need to be updated + */ + max-height: calc(100vh - 160px); +} + +.quick-user { + padding: 15px 5px; + text-align: center; +} + +.nav-tabs { + border-bottom: 1px solid #ddd; } \ No newline at end of file diff --git a/assets/img/logo_64.png b/assets/img/logo_64.png index 339504741b41fc266996cc3de89669173d485437..73388bd6cf0bdaf27eb82fbfb42d90e36592f891 100644 GIT binary patch delta 919 zcmV;I18Dr}74`>^ZGQuENklt;1W^wbq|`%tZExMK zP!kI&ww?;xlRqv!_NE81|A647m0VnHDZTBs^dL4@r;tO56v03ci?J08?ZQa>_K>XZ zw$)5@X1?8K9vH}E-gkK3PcrYklQ*xSfrwbZByb-{126Oc;(rME5%>c5(ikHE20%n! z0KNj=QPYc-?|?~T%if8vlexz`I67J_H_U+bHpY1$?Y+p~!tBBEJGJX`3i< zWJKhQMrYWDh(-H09>7@I2HLcJ0Jr=WTw7aXWo3m@sYI<-3)AV^*tX5c$OzNZ(@afG z`Ku&8SX^8b;D5Q=mX?ntTr=P*=Zv^5R8gIT0pL~Spd2DZQGd4DMW$~t+;PLVC z#mcTP@DI6FIQrOH1@r_+?n+-H#ax0bu26*4xH1G8;gN~KbiO8)KwL6OO1nt%4<+rQ`ucj6m&s(r zb=|NuTOSEt#@^l@%gf7@%VmniBD=f0L7euS;o)IMM@JbP9AtKOmZ71cU``xVlDS+i zvVZY@E|&{RTLOEo&1SO{3WbaR6oy11kszDR26n#4p9TJF#6O8?3ut3e?^xOuv4G#S zEfhJj09V^Wk!_3mTH1DH)rg3pzKryqwoSx51jen#D(Xq%S#T7`8OMJ;vopGH39SxpNl2J0*x)PiNgRWD z2sU8sN+mH#*_Bj|%2O&&b}CP)%1bH_ah%vBcH$e`WiW>;4mLy_wmBqDN$7ypN`QnU zv};y-%yu4Twc1^@TJ7#^EbM<3RobR|zV3hb_wVoPnHGc~rGHd_&A?V*B~Zp!3xmKh z;3eQqA%p}F08+|A;4R>xFRgq3U+e`o3n4~DXy$iwlMcS$Ejcw{U<9YGm#x8Vc9ncx zj2G<&9uZQ?Ex>D;?Pg{$a9#53fie8X^y*jV3!eK{HX_Uck1N2BGSj`xqhlyI?ZE@| zxg|qmGO}o^f`2J^Hzf=y6IZ&SP1Mg@6`;hT{@jcxQwZ$@UsDKMrk?EbNgSh+Lr#Mg zl?n}|3I+Pi<2oY*T=&D<=K}n$*&8m~x=iDjtMnO1f|7}c`h$``9Pvh#ZEN)>+^fF~ zWP|`kfH!7)l0YDN(atzBLO@W$@>yzB*@{XPEhE;_Lx0A)bY{?80<{IE37;WJVcX6) zEGHl+VOM7WuK|Twg5Tet1;ClXAil4I2Dp5Zmso&Ibt2uvK6= z0sU@C=ZHDgKU}I|1Yv!hx!bhR79N^=N#+2G)=?XAH{txi<3XQ@nbLr2@6;y`YU{_~m z+(1*{SF3f7^cif}?%~I~J?N_7iN)HK?JOf;T>N|?@w>A|4JR4dDy&;*F1B~tGUEn! z&$jVlcYuGK^yBhLF1aPY-shzvSD`9De)MS>0e>!^sA-*JUqXEf1L@i{ak=`3v3i; zr_aFsb8Y;!#dN`jQibwdF|EOa1uoF%mYg3pjcr<_^4h194<2Ag>j)3eH%*?nY>gY_ zX@W&%3OhQ+T~OygJ%MSrPm6#^@w?Toa%seiW7rqB{@MO9Dslv6Ip%KgVRs;wZgGW(?2UuivUBKTN=RkZc%yV@L<9=drpn8X1=M`+uH(M^QF#! z5U{%1#;d1I7yQ9ejb=x3TWrb%1SRY|KOugr>?$9fbtP=KqjiLJ^GvhHFBt^W$PLPK z1P2@ehQ}nj3L6?UntPLbV9Erze1DRcS|=jE!(DFt({Sq3ePdMR3ra(7@X>_;sjh*N zY$cp}Ke|Zc^XIfHS!UR;odnaLw_F0!1d%G zlu{fJDSl7KiTtKQtJ6bmfuJ}`FyfW`yC=XhwFhT!@09I?5ZLW@8XFrK^+^tg0-tAA z=zM%J`PqjQ2#6KGJ0jBFWN^6C%|i=vc=N2Ex7z|NS)NBvPfx;j-QC?3&#K{%EgBN2 zFI6bZ6?6`#rlv`|K&<#_DSyVY`#W50X)^i$yx*Xtv<#aq@qFmIj;d$#etT+xPb`uq z!0Cz>zu2^Qx@fyR#{6Q1;w(W>!Y7U(wY9Yg+toKN=GC*oaNx5#$-pNTNf9ua_@x6) z5qvuo6uoyI?DHC?tgk2vbL$#;`II^1TbJoHJB+l>7Lp>skg&Hqb${`TMXolHB7fR% zP*zqxr5ns!uz&--gae*R-4$ zPMXvG*dh&=S0)|!#9~qcJRT1&mn-VuwK0QjCr$C&+-L(MfVALUm!=9HoEvh3PO#6d zpR`_8RTVv7XyMHBr++Iou8yT||AzH;@Zdq(+S;PZ%FD~CUAZPKeor<^_UwF*tgI~7 zu3d|!r7i|JHrP-nd8ZwYI1S40t3Xv%3?q7JFI>EW=T4Y^-!t3%+-)q7{!50a72xrB zZWz3->nvKbf^BEa-?!RT{9laXcDuQH^(wsyf|u!_p+u0c3x5m=|D9wvC@d^Q$t|8Z z@mZ--l&1cSBZ>gO-yij#RaMojS^pSET;=TTGL1iVi{xVa$+&G&L0_+fH4$!58RG_Z zi#vYH9#j*wDo5=OzN5yQ*Pic-S)AaS2cqWzzTg{vbqtYib3g zlsJ1GJTNyRD4JW3qA1L-Z{+3Ep_F%tLRb44OLm`e#D68=%9SfTFh_~}xEO%%H%SKj zE?CxqarE_c@L0$V4mu5HRaUZ~u8#dqGw{h$VN-)bXZtxz?Zzd*Od(ej1cGqLX|QVb?L6ON&h~ffRr(wk@cH5&x~76D zQiU~oV`3Sr7-)5VPXaP9Kt z%Pc83-M}A&mMiAg_p{~DdHPsJY|bbGq?8N|4S%z$YNA`Z3Uy^Ru3x{N5t}oL0A1H9 zDlHA4^#S+{c&<4>!_v%LYnV|46ciNDan-otGuzMlgA|oy<`UbCB4BiMl!YZKYD}Ef zSf=0_y_ON1Gl~Ge-_Jn*MV`IehAq^y1;q-#y-Uz}`glfc+Av>B%$Se(TRuC)Ei3#q zKYzK<{JuEgqxEoernX{f1BRGEw?qxYp!MhxT8|!?^kBqd3@X6U@n4FPyhn&oVx%Vd ze!vz{Kc3xqgCDQ2rjV4y=*#B{=3QC<^78U1E-s$_!&DW!-44Kg4f#oRgr-_Z0fc`2r4Tpsi>$3mtAs8PEPac?5Zl2JS|MX zE?|A+<>}XfwF!Iw)xa*`2_eL2n2yj&*ob+Rb|p{|r}52-0ZhGn5!gO{eg1#NH4-_> T*`{fh00000NkvXXu0mjfBjY_> diff --git a/cards/js/qwikclock_myshifts.js b/cards/js/qwikclock_myshifts.js new file mode 100644 index 0000000..47f4610 --- /dev/null +++ b/cards/js/qwikclock_myshifts.js @@ -0,0 +1,41 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +$(".card_qwikclock_myshifts").each(function () { + var card = $(this); + $(this).find(".card_title").prepend("Shifts | "); + var shiftbox = $(this).find(".shift-box"); + var shifttable = $(this).find(".shift-table"); + var url = $(this).data("apiurl"); + $.post(url, { + username: getuser(), + password: getAPIKey(), + action: "getassignedshifts" + }, function (resp) { + if (resp.status == "OK") { + var shifts = resp.shifts; + if (shifts.length > 0) { + shifttable.html('Shift Start End Days'); + shifttable.append(""); + for (var shift in shifts) { + var days = ""; + for (var day in shifts[shift]["day_list"]) { + days += " " + shifts[shift]["day_list"][day]; + } + days = days.trim(); + shifttable.append('' + shifts[shift]['shiftname'] + '' + shifts[shift]['start_f'] + '' + shifts[shift]['end_f'] + '' + days + ''); + } + shifttable.append(""); + } else { + shifttable.html('
No shifts assigned.
'); + } + } else { + showmsg(resp.msg, "danger"); + } + }, "json").fail(function () { + card.css("display", "none"); + }); +}); \ No newline at end of file diff --git a/cards/js/qwikclock_punchinout.js b/cards/js/qwikclock_punchinout.js index 26f3aea..b070ff6 100644 --- a/cards/js/qwikclock_punchinout.js +++ b/cards/js/qwikclock_punchinout.js @@ -4,6 +4,20 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +$(".card_qwikclock_punchinout").each(function () { + var card = $(this); + var url = $(this).data("apiurl"); + $.post(url, { + username: getuser(), + password: getAPIKey(), + action: "ping" + }, function (resp) { + // We didn't get a 403 + }, "json").fail(function () { + card.css("display", "none"); + }); +}); + $(".card_qwikclock_punchinout").on("click", ".start_btn", function () { var parent = $(this).parents(".card_app"); var url = parent.data("apiurl"); diff --git a/cards/js/taskfloor_viewmessages.js b/cards/js/taskfloor_viewmessages.js index 66549fe..b050af5 100644 --- a/cards/js/taskfloor_viewmessages.js +++ b/cards/js/taskfloor_viewmessages.js @@ -6,7 +6,8 @@ $(".card_taskfloor_viewmessages").each(function () { - $(this).find(".card_title").append(" Messages"); + var card = $(this); + $(this).find(".card_title").prepend("Messages | "); var msglist = $(this).find(".message-list"); var url = $(this).data("apiurl"); $.post(url, { @@ -27,5 +28,7 @@ $(".card_taskfloor_viewmessages").each(function () { } else { showmsg(resp.msg, "danger"); } - }, "json"); + }, "json").fail(function () { + card.css("display", "none"); + }); }); \ No newline at end of file diff --git a/cards/js/taskfloor_viewtasks.js b/cards/js/taskfloor_viewtasks.js index 73354b5..7e85a03 100644 --- a/cards/js/taskfloor_viewtasks.js +++ b/cards/js/taskfloor_viewtasks.js @@ -6,7 +6,8 @@ $(".card_taskfloor_viewtasks").each(function () { - $(this).find(".card_title").append(" Tasks"); + var card = $(this); + $(this).find(".card_title").prepend("Tasks | "); var tasklist = $(this).find(".task-list"); var url = $(this).data("apiurl"); $.post(url, { @@ -28,5 +29,7 @@ $(".card_taskfloor_viewtasks").each(function () { } else { showmsg(resp.msg, "danger"); } - }, "json"); + }, "json").fail(function () { + card.css("display", "none"); + }); }); \ No newline at end of file diff --git a/cards/qwikclock_myshifts.html b/cards/qwikclock_myshifts.html new file mode 100644 index 0000000..9477b23 --- /dev/null +++ b/cards/qwikclock_myshifts.html @@ -0,0 +1,9 @@ + +

QwikClock | Shifts

+ + +
\ No newline at end of file diff --git a/cards/taskfloor_viewmessages.html b/cards/taskfloor_viewmessages.html index f5b68dd..5f62831 100644 --- a/cards/taskfloor_viewmessages.html +++ b/cards/taskfloor_viewmessages.html @@ -3,8 +3,6 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -

TaskFloor Messages

-
-
-
+

TaskFloor Messages

+
\ No newline at end of file diff --git a/cards/taskfloor_viewtasks.html b/cards/taskfloor_viewtasks.html index a519452..b545d91 100644 --- a/cards/taskfloor_viewtasks.html +++ b/cards/taskfloor_viewtasks.html @@ -3,8 +3,6 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -

TaskFloor Tasks

-
-
-
+

TaskFloor Tasks

+
\ No newline at end of file diff --git a/index.html b/index.html index b92d882..a1c780c 100644 --- a/index.html +++ b/index.html @@ -11,19 +11,18 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. + + -
- -
+
-
-
+
@@ -35,5 +34,5 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. \ No newline at end of file diff --git a/js/functions.js b/js/functions.js index ce93f14..8ba0c98 100644 --- a/js/functions.js +++ b/js/functions.js @@ -44,7 +44,7 @@ function showmsg(text, style, details, timeout) { } $("#alert-box") .hide() - .html('') + .html('') .fadeIn("fast"); clearTimeout(msgtimeout); if (timeout !== false) { diff --git a/js/home.js b/js/home.js index 1a1f625..d2b5a9f 100644 --- a/js/home.js +++ b/js/home.js @@ -8,10 +8,19 @@ var loadedCardTypes = []; var totalCardTypes = []; +var cardSettings = { + "qwikclock_punchinout": {"classes": "col-sm-12 col-md-4 col-lg-4 col-xl-4 order-1"}, + "qwikclock_myshifts": {"classes": "col-sm-12 col-md-8 col-lg-8 col-xl-6 order-2"} +}; + function loadCard(type, apiurl, title) { $.get("cards/" + type + ".html", {}, function (html) { console.log(type + " " + apiurl + " " + title); - var box = $('
'); + var cardClasses = "col-sm-12 col-md-6 col-lg-6 col-xl-4 order-12"; + if (cardSettings.hasOwnProperty(type) && cardSettings[type].hasOwnProperty("classes")) { + cardClasses = cardSettings[type]["classes"]; + } + var box = $('
'); var card = $('
'); $(card).html(html); $(box).html(card); @@ -69,4 +78,5 @@ getApps(function (apps) { startSessionTimeout(); -$("#sign-out-btn").css("display", "inline-block"); \ No newline at end of file +$("#sign-out-btn").css("display", "inline-block"); +$("#refresh-btn").css("display", "inline-block"); \ No newline at end of file diff --git a/main.js b/main.js index 044b742..bd3d3c9 100644 --- a/main.js +++ b/main.js @@ -8,7 +8,6 @@ nw.Window.open('index.html', { "id": "station_mainwindow" }, function (win) { - win.setMinimumSize(780, 640); + win.setMinimumSize(640, 480); win.setPosition("center"); - }); diff --git a/pages/login.html b/pages/login.html index 0f7e170..1d0aba0 100644 --- a/pages/login.html +++ b/pages/login.html @@ -1,6 +1,6 @@
-
+

Login

    @@ -16,6 +16,40 @@
+
+
+
+ +
+ Caroline Herschel +
+
+ +
+ Edmond Halley +
+
+ +
+ Jocelyn Bell Burnell +
+
+ +
+ Max Born +
+
+ +
+ Patty Jo Watson +
+
+ +
+ Sarah Boysen +
+
+