From 0c4ce7ba39486afa3bac89a74a68eb440fa727ee Mon Sep 17 00:00:00 2001 From: jefry Date: Wed, 14 Sep 2022 17:02:15 +0700 Subject: [PATCH] push --- .DS_Store | Bin 10244 -> 10244 bytes public/.DS_Store | Bin 8196 -> 8196 bytes public/js/.DS_Store | Bin 6148 -> 6148 bytes public/js/main.js | 36 ++++++++++++++++++++++++--- public/js/page/dashboard.js | 8 ++++-- public/vendor/.DS_Store | Bin 10244 -> 10244 bytes public/vendor/multiselect-master/js/index.js | 26 +++++++++++++------ views/.DS_Store | Bin 6148 -> 6148 bytes views/pages/dashboard.ejs | 4 +-- views/partials/.DS_Store | Bin 6148 -> 6148 bytes views/partials/dashboard/modal_form.ejs | 34 +++++++++++++++++-------- 11 files changed, 84 insertions(+), 24 deletions(-) diff --git a/.DS_Store b/.DS_Store index 75548c025904b2222680f5e10278de6420b67dc0..26d1bba7fac175068c3a3bc35cd5a1855c3fb7e4 100644 GIT binary patch delta 49 zcmZn(XbIRbS%TS8%6M{?gv{hk61hx40h<*iXE8E~_D$X^mB#pCvx+o36H|BEW?k9q FTmY1i59R;> delta 49 zcmZn(XbIRbS%O*ThV$es37N^8ByyRY7&a?P&SGTZi=Mn!Dvj~MW)*36CZ;y7&APJJ Fxd5P151ar1 diff --git a/public/.DS_Store b/public/.DS_Store index 4149c9f7d87857ae25c2eecf345ffcb648b05861..e84689ed6cb8f5972c420952c5efdd4fd5da9a51 100644 GIT binary patch delta 70 zcmZp1XmQxEMNlP|^O%H9#t}yb1_ow^Oom*B^xXUum!zEhB%lZfM0WBGK_jLl#mPKE VevAt?M+>nqF@4J1oG7xG8vx>c6s`aO delta 70 zcmZp1XmQxEMNoz9dy=$D+7U+v1_ow^Oom*B^xXUum!zEhB%lZfM0WBGK_jMEoyj~x VevA_~M+>nqF@4b9oG7xG8vx~O6np>x diff --git a/public/js/.DS_Store b/public/js/.DS_Store index 3252a4a40a2977dfabe31107e75c21db70cc5fe2..098bc3f3a00a888771409853536652b135870325 100644 GIT binary patch delta 13 UcmZoMXfc?ujA@qd#uYK*040M3Q~&?~ delta 13 UcmZoMXfc?ujA^FP#uYK*03`MWH~;_u diff --git a/public/js/main.js b/public/js/main.js index d4f17be..dfbf9c7 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -1,10 +1,25 @@ +$(".modalCompanyAll").change((e)=>{ + e.preventDefault(); + if($(e.target).prop('checked')){ + $("#modal-form .modalCompanySelect").parent('.drop').hide(); + $("#modal-form .modalCompanySelect").val('All').change(); + } + else{ + $(".modalCompanySelect").parent('.drop').show(); + } +}); + + + $(".modalCompanySelect").change(async(e)=>{ - if(e.target.value&&e.target.value!=''){ + if($(e.target).val()&&$(e.target).val().length>0){ + // console.log(`/api/divisions${(e.target.value == 'All')?'':`?filters[companies][id][$in]=[${$(e.target).val()}]`}`); $(".modalDivisionSelect").removeAttr('disabled'); + $(".modalDivisiAll").removeAttr('disabled'); var getToken = await fetch(`/session/key?s=jwt`); if(getToken.ok){ var token = await getToken.text(); - var res = await fetch(`/api/divisions${(e.target.value == 'All')?'':`?filters[companies][id][$in]=${e.target.value}`}`,{ + var res = await fetch(`/api/divisions${(e.target.value == 'All')?'':`?${$(e.target).val().map((i,idx)=>`filters[companies][id][$in][${idx}]=${i}`).join('&')}`}`,{ headers:{ "Authorization" : "Bearer "+token, } @@ -12,10 +27,15 @@ $(".modalCompanySelect").change(async(e)=>{ if(res.ok){ var obj = await res.json(); $(".modalDivisionSelect").empty(); - $(".modalDivisionSelect").append(($("#formCreateAdmin").length>0)?'':''); + // $(".modalDivisionSelect").append(($("#formCreateAdmin").length>0)?'':''); obj.data.forEach((i)=>{ $(".modalDivisionSelect").append(``); }); + + if($('#modal-form .modalDivisionSelect')){ + selectDivisiList.load(); + selectDivisiList.renderOptions(); + } } } else{ @@ -27,6 +47,16 @@ $(".modalCompanySelect").change(async(e)=>{ } }); +$(".modalDivisiAll").change((e)=>{ + e.preventDefault(); + if($(e.target).prop('checked')){ + $(".modalDivisionSelect").parent('.drop').hide(); + } + else{ + $(".modalDivisionSelect").parent('.drop').show(); + } +}); + $('#modal-reset-password').on('shown.bs.modal',async function () { var getToken = await fetch(`/session/key?s=jwt`); if(getToken.ok){ diff --git a/public/js/page/dashboard.js b/public/js/page/dashboard.js index 8103f8c..8b80e8e 100644 --- a/public/js/page/dashboard.js +++ b/public/js/page/dashboard.js @@ -5,11 +5,11 @@ let attachment; let removeMedia = []; var selectCompanyList = new drop({ - selector: '.modalCompanySelect' + selector: '#modal-form .modalCompanySelect' }); var selectDivisiList = new drop({ - selector: '.modalDivisionSelect' + selector: '#modal-form .modalDivisionSelect' }); @@ -294,6 +294,10 @@ $('#modal-form').on('shown.bs.modal', async function() { $("#modal-form input[type!='hidden']").val(''); $('#modal-form select').val(''); $('#modal-form select[name=division]').attr('disabled','disabled'); + $('#modal-form input.modalDivisiAll').attr('disabled','disabled'); + $('#modal-form input[type=checkbox]').prop('checked',false); + $("#modal-form .modalCompanySelect").parent('.drop').show(); + $("#modal-form .modalDivisionSelect").parent('.drop').show(); $('#modal-form textarea').html(''); $('#modal-form textarea').val(''); const container = document.getElementById('participantCounter'); diff --git a/public/vendor/.DS_Store b/public/vendor/.DS_Store index d31d163830a956caaad556585953e2fbe834fa16..c8a9abb3b972f4db0f12040abc0318eccc3ae5b7 100644 GIT binary patch delta 19 acmZn(XbITRB*Ek^Hu->r*5-8*Vf+9`@dm{J delta 19 acmZn(XbITRB*ElzWAXtBt!i.removed).map(i=>$(info.selector).children('option')[i.index].value)).trigger('change') + // } this.html.drop.classList.toggle('open'); }, addOption: function(e, element){ @@ -82,14 +85,18 @@ var drop = function(info){var o = { }, load: function(){ this.options = []; + this.html.options =render.get(info.selector + ' option'); for(var i = 0; i < this.html.options.length; i++){ - var option = this.html.options[i] - this.options[i] = { - html: option.innerHTML, - value: option.value, - selected: option.selected, - state: '' + var option = this.html.options[i]; + if(!$(option).prop('hidden')){ + this.options[i] = { + html: option.innerHTML, + value: option.value, + selected: option.selected, + state: '', + } } + } }, preselect: function(){ @@ -145,6 +152,10 @@ var drop = function(info){var o = { }) }, changeState: function(state){ + var drop = this; + setTimeout(function(){ + $(info.selector).val(drop.selected.filter(i=>!i.removed).map(i=>$(info.selector).children('option')[i.index].value)).trigger('change'); + }, 1000); switch(state){ case 'remove': return 'hide' @@ -152,13 +163,14 @@ var drop = function(info){var o = { return 'hide' default: return '' - } + }; }, isSelected: function(index){ var check = false this.selected.forEach(function(select){ if(select.index == index && select.removed == false) check = true }) + return check } }; o.init(); return o;} diff --git a/views/.DS_Store b/views/.DS_Store index 224b407b8f33a3b3a55a9a7018aa8ad8183bbaca..b8a610feea986fa81645da1c7dec9441d1f65423 100644 GIT binary patch delta 21 ccmZoMXffEJ$;3EwvKCVdlUe5G4NM`T07`NOkN^Mx delta 21 ccmZoMXffEJ$;9Y6S&ONK$uM^F2Br{E07dr(F8}}l diff --git a/views/pages/dashboard.ejs b/views/pages/dashboard.ejs index fdfe46d..5574a98 100644 --- a/views/pages/dashboard.ejs +++ b/views/pages/dashboard.ejs @@ -1,5 +1,5 @@ - + @@ -109,7 +109,7 @@
+ + +
- + + <% for(var i=0; i <% } %> @@ -46,12 +53,19 @@
-
-
- +
+
+  Pilih Divisi +
+ + +