From e25d09aa5da796b34cc7b26b675f55e62a9a51ee Mon Sep 17 00:00:00 2001 From: Davide Bongiovanni Date: Sun, 11 Nov 2018 18:25:42 +0100 Subject: [PATCH] Removed unnecessary comments. Re-performing query on save. Hiding/showing duplicate button. Fixed text field text showing the correct thing. --- parts/static/script.js | 49 ++++++------------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/parts/static/script.js b/parts/static/script.js index 7ad8098..af31969 100644 --- a/parts/static/script.js +++ b/parts/static/script.js @@ -10,6 +10,8 @@ function init_edit(partID) { $('table#details tr#datasheet td input').show(); + $('#duplicate-button').closest('div').hide(); + var datasheet_input = $('') $('#datasheet-info').replaceWith(datasheet_input); @@ -21,9 +23,8 @@ function new_entry() { $('table#details tr#location td p').text(''); $('table#details tr#partno td p').text(''); $('table#details tr#description td p').text(''); - // $('table#details tr#location select').text(''); - $('table#details tr#partno td input').text(''); - $('table#details tr#description td input').text(''); + $('table#details tr#partno td input').val(''); + $('table#details tr#description td input').val(''); init_edit(-1); overlay_in(); } @@ -44,46 +45,21 @@ function end_edit() { $('table#details tr#datasheet td input').hide(); + $('#duplicate-button').closest('div').show(); + var newButton = '
'; $('.round-button-left').replaceWith(newButton); } function save(partID) { - // var block_v = $('#block-input').val(); - // var type_v = $('#type-input').val(); var location_id_v = $('table#details tr#location td select').val(); var partno_v = $('table#details tr#partno td input').val(); var description_v = $('table#details tr#description td input').val(); - // var quantity_v = $('#quantity-input').val(); - // var notes_v = $('#notes-input').val(); var datasheet = $('table#details tr#datasheet td input')[0].files; - // if(! partno_v.match(/^([a-zA-Z0-9]{1,20}\s*){1,3}$/g)) { - // alert('Invalid part number format. Accepted: '); - // return; - // } - // if(! block_v.match(/^[0-9]+$/g)) { - // alert('Invalid location field. Only numbers accepted.'); - // return; - // } - // if(type_v.length > 25) { - // alert('Manufacturer name too long (max 25 characters).') - // return; - // } if(description_v.length > 200) { alert('Description too long (max 200 characters).') return; } - // if(quantity_v.length > 10) { - // alert('Quantity info too long (max 10 characters).') - // return; - // } - // if(notes_v.length > 200) { - // alert('Notes too long (max 200 characters).') - // return; - // } - - // var partnos = partno_v.split(' '); - var data = new FormData(); if (datasheet.length == 1) @@ -92,21 +68,9 @@ function save(partID) { return; } data.append('datasheet-file', datasheet[0]); - // data.append('block', block_v); - // data.append('type', type_v); data.append('partno', partno_v); data.append('location_id', location_id_v) - // if (partnos.length > 1) - // data.append('partnoalt', partnos[1]); - // else - // data.append('partnoalt', ''); - // if(partnos.length > 2) - // data.append('partnoalt2', partnos[2]); - // else - // data.append('partnoalt2', ''); data.append('description', description_v); - // data.append('quantity', quantity_v); - // data.append('notes', notes_v); $.ajax({ // Your server script to process the upload @@ -134,6 +98,7 @@ function save(partID) { }); end_edit(); + perform_query(); } function text_filter(string) {