From edd395799a8650f3cd40bd5e85e1e5d82f0e5c14 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Sun, 17 Sep 2017 19:43:57 +0200 Subject: [PATCH] Add number of things feature --- public_html/inc/main.js | 119 ++++++++++++++++++++------------ public_html/inc/mysc_objects.js | 29 ++++++-- public_html/index.html | 25 +++++-- 3 files changed, 117 insertions(+), 56 deletions(-) diff --git a/public_html/inc/main.js b/public_html/inc/main.js index 26b3441..bea4b5c 100644 --- a/public_html/inc/main.js +++ b/public_html/inc/main.js @@ -373,33 +373,46 @@ on_valid_add_thing_modal=function (e) { if (scase) { var cat=scase.cats.byName(modal.data('cat')); if (cat) { + var things=[]; var labels=[]; var error=false; + var add_thing_nbs=$('input.add_thing_nb'); $('input.add_thing_label').each(function(idx,input) { - var val=$(input).val(); - if (val && val!='') { - if (labels.indexOf(val)>-1) { + var label=$(input).val(); + if (label && label!='') { + if (labels.indexOf(label)>-1) { alert("Deux élements ne peuvent porter le même nom !"); error=true; return; } - if (cat.byLabel(val)) { - alert("L'élément '"+val+"' existe déjà !"); + if (cat.byLabel(label)) { + alert("L'élément '"+label+"' existe déjà !"); error=true; return; } - labels.push(val); + var nb=1; + if (add_thing_nbs[idx]) { + nb=parseInt($(add_thing_nbs[idx]).val()); + if (!nb || nb==0) { + nb=1; + } + } + things.push({ + 'label': label, + 'nb': nb + }); + labels.push(label); } }); if (error) { return; } - if (labels.length==0) { + if (things.length==0) { alert("Vous devez saisir au moins un nom d'élément !"); return; } - for (idx in labels) { - cat.newThing(labels[idx]); + for (idx in things) { + cat.newThing(things[idx]['label'], things[idx]['nb']); } scases.save(); show_scase(scase,cat.name); @@ -409,8 +422,9 @@ on_valid_add_thing_modal=function (e) { } on_show_add_thing_modal=function () { - $('input.add_thing_label_other').parent().remove(); + $('.add_thing_other').remove(); $('input.add_thing_label').val(''); + $('input.add_thing_nb').val(''); $('input.add_thing_label').first().focus(); } @@ -420,63 +434,77 @@ on_close_add_thing_modal=function () { on_add_thing_label_focus=function(event) { if ($('input.add_thing_label').last()[0] == event.target) { - var new_input_group=$('
'); - var new_input=$(''); - new_input_group.append(new_input); - new_input.bind('focus', on_add_thing_label_focus); + var new_input_group=$('
'); + var new_input_label=$(''); + var new_input_nb=$(''); + new_input_group.append(new_input_label); + new_input_group.append(' '); + new_input_group.append(new_input_nb); + new_input_label.bind('focus', on_add_thing_label_focus); $(event.target).parent().after(new_input_group); } } /*********************** - * Rename thing + * Edit thing **********************/ -on_rename_thing_btn_click=function(event) { +on_edit_thing_btn_click=function(event) { navbar_collapse_hide(); - $('#rename_thing_modal').data('cat',event.data.cat.name); - $('#rename_thing_modal').data('thing',event.data.thing.label); - $('#rename_thing_label')[0].value=event.data.thing.label; - $('#rename_thing_modal').modal('show'); + $('#edit_thing_modal').data('cat',event.data.cat.name); + $('#edit_thing_modal').data('thing',event.data.thing.label); + $('#edit_thing_label').val(event.data.thing.label); + $('#edit_thing_nb').val(event.data.thing.nb); + $('#edit_thing_modal').modal('show'); } -on_valid_rename_thing_modal=function (e) { +on_valid_edit_thing_modal=function (e) { e.preventDefault(); - var label=$('#rename_thing_label')[0].value; + var label=$('#edit_thing_label').val(); if (label=='') { alert("Vous devez saisir le nouveau nom de l'élément !"); return; } + var nb=parseInt($('#edit_thing_nb').val()); + if (!nb || nb==0) { + nb=1; + } var scase=scases.byName($('#cats').data('scase')); if (scase) { - var cat=scase.cats.byName($('#rename_thing_modal').data('cat')); + var cat=scase.cats.byName($('#edit_thing_modal').data('cat')); if (cat) { - var namesake=cat.byLabel(label); - if (namesake) { - if (namesake.removed) { - alert("Un élément de ce nom existe dans la corbeille !"); + if (label!=$('#edit_thing_modal').data('thing')) { + var namesake=cat.byLabel(label); + if (namesake) { + if (namesake.removed) { + alert("Un élément de ce nom existe dans la corbeille !"); + } + else { + alert("Un élément de ce nom existe déjà !"); + } + return; } - else { - alert("Un élément de ce nom existe déjà !"); - } - return; + var thing=cat.renameThing($('#edit_thing_modal').data('thing'),label); + } + else { + var thing=cat.byLabel(label); } - var thing=cat.renameThing($('#rename_thing_modal').data('thing'),label); if (thing) { + thing.setNb(nb); scases.save(); show_scase(scase,cat.name); } } } - $('#rename_thing_modal').modal('hide'); + $('#edit_thing_modal').modal('hide'); } -on_show_rename_thing_modal=function () { - $('#rename_thing_label').focus(); +on_show_edit_thing_modal=function () { + $('#edit_thing_label').focus(); } -on_close_rename_thing_modal=function () { - $('#rename_thing_modal form')[0].reset(); +on_close_edit_thing_modal=function () { + $('#edit_thing_modal form')[0].reset(); } /*********************** @@ -557,6 +585,9 @@ show_cat=function(cat,displayed) { continue; } var li=$('
  • '+cat.things[idx].label+'
    • '); + if (cat.things[idx].nb>1) { + li.append(' ('+cat.things[idx].nb+')'); + } if (cat.things[idx].checked) { li.addClass('done'); } @@ -568,9 +599,9 @@ show_cat=function(cat,displayed) { delete_el_btn.bind('click',{'cat': cat,'thing': cat.things[idx]},on_delete_thing_btn_click); li_actions.append(delete_el_btn); - var rename_el_btn=$(''); - rename_el_btn.bind('click',{'cat': cat,'thing': cat.things[idx]},on_rename_thing_btn_click); - li_actions.append(rename_el_btn); + var edit_el_btn=$(''); + edit_el_btn.bind('click',{'cat': cat,'thing': cat.things[idx]},on_edit_thing_btn_click); + li_actions.append(edit_el_btn); li.append(li_actions); @@ -895,10 +926,10 @@ $( document ).ready( function() { $("#add_thing_modal").on('hidden.bs.modal',on_close_add_thing_modal); $("#add_thing_modal form").bind('submit',on_valid_add_thing_modal); - $('#rename_thing_submit').bind('click',on_valid_rename_thing_modal); - $("#rename_thing_modal").on('shown.bs.modal',on_show_rename_thing_modal); - $("#rename_thing_modal").on('hidden.bs.modal',on_close_rename_thing_modal); - $("#rename_thing_modal form").bind('submit',on_valid_rename_thing_modal); + $('#edit_thing_submit').bind('click',on_valid_edit_thing_modal); + $("#edit_thing_modal").on('shown.bs.modal',on_show_edit_thing_modal); + $("#edit_thing_modal").on('hidden.bs.modal',on_close_edit_thing_modal); + $("#edit_thing_modal form").bind('submit',on_valid_edit_thing_modal); $('#app-name').bind('click', show_scases); diff --git a/public_html/inc/mysc_objects.js b/public_html/inc/mysc_objects.js index 6b995cf..906d7f1 100644 --- a/public_html/inc/mysc_objects.js +++ b/public_html/inc/mysc_objects.js @@ -8,11 +8,19 @@ function SCaseList() { 'Vacances': { 'Papier': { 'color': '#f00', - 'things': ['Papier blanc', 'Stylo', "Carte d'identité"] + 'things': [ + {'label': 'Papier blanc', 'nb': 1 }, + {'label': 'Stylo', 'nb': 3 }, + {'label': "Carte d'identité", 'nb': 1 }, + ] }, 'Multimédia' : { 'color': '#0f0', - 'things': ['Montre', 'Chargeur montre', "PC portable"] + 'things': [ + {'label': 'Montre', 'nb': 1 }, + {'label': 'Chargeur montre', 'nb': 1 }, + {'label': 'PC portable', 'nb': 1 }, + ] } } }; @@ -21,7 +29,7 @@ function SCaseList() { for (catName in exampleData[scaseName]) { var cat=scase.cats.newCat(catName); for (idx in exampleData[scaseName][catName].things) { - cat.newThing(exampleData[scaseName][catName].things[idx]); + cat.newThing(exampleData[scaseName][catName].things[idx]['label'],exampleData[scaseName][catName].things[idx]['nb']); } } } @@ -468,18 +476,19 @@ function Cat(uuid,name,color,data) { }; } - this.newThing=function(label) { + this.newThing=function(label,nb) { if (this.byLabel(label)) { var thing=this.byLabel(label); if (thing.removed) { thing.restore(); thing.setChecked(false); + thing.setNb(nb); return true; } } else { var uuid=generate_uuid(); - this.things[uuid]=new Thing(uuid,label); + this.things[uuid]=new Thing(uuid,label,nb); return true; } return false; @@ -541,10 +550,11 @@ function Cat(uuid,name,color,data) { } -function Thing(uuid,label,checked) { +function Thing(uuid,label,nb,checked) { this.uuid=uuid||generate_uuid(); this.lastChange=new Date().getTime(); this.label=label; + this.nb=nb || 1; this.checked=checked; this.removed=false; @@ -552,6 +562,7 @@ function Thing(uuid,label,checked) { this.uuid=data.uuid||generate_uuid(); this.lastChange=data.lastChange||new Date().getTime(); this.label=decodeURIComponent(data.label), + this.nb=data.nb||1; this.checked=data.checked; this.removed=data.removed||false; } @@ -561,11 +572,17 @@ function Thing(uuid,label,checked) { 'uuid': this.uuid, 'lastChange': this.lastChange, 'label': encodeURIComponent(this.label), + 'nb': this.nb, 'checked': this.checked, 'removed': this.removed, }; } + this.setNb=function(nb) { + this.nb=nb; + this.lastChange=new Date().getTime(); + } + this.setChecked=function(value) { this.checked=value; this.lastChange=new Date().getTime(); diff --git a/public_html/index.html b/public_html/index.html index 606e35b..a8594f9 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -51,6 +51,16 @@ div.panel-heading, li.list-group-item, a { .scase-name { font-size: 1.5em; } + +.add_thing_label, #edit_thing_label { + width: 80%; + display: inline-block; +} + +.add_thing_nb, #edit_thing_nb { + width: 18%; + display: inline-block; +} @@ -214,10 +224,12 @@ div.panel-heading, li.list-group-item, a {
    - + +
    - + +
    @@ -229,23 +241,24 @@ div.panel-heading, li.list-group-item, a { -