diff --git a/bindTicketShelving.js b/bindTicketShelving.js index 45ba2f3..f75e78e 100644 --- a/bindTicketShelving.js +++ b/bindTicketShelving.js @@ -1,5 +1,7 @@ -const insert = require('./utilities/inserts'); +const insert = require('./insertTicket'); +const filter = require('./filter'); + var barcode = "A0A3B820690F"; var shelving = "ABC";///introducida por el usuario @@ -35,7 +37,7 @@ var consultaSql1 = [ function ticketCollection(){//parametro collectionFk /// CONSULTA SQL PER A TINDRE ELS DIFERENTS ticketsColletion DE UN colletionFK (consiltaSql1) /// /// CONSULTA SQL PER A CADA ticket DE CADA ticketCollection (consiltaSql2) /// - if(insert.filter(shelving,"shelving")){ + if(filter.filterShelving(shelving)){ insert.insertTicket(consultaSql1, shelving) } else{ @@ -43,5 +45,4 @@ function ticketCollection(){//parametro collectionFk } } -ticketCollection(); -//proba \ No newline at end of file +ticketCollection(); \ No newline at end of file diff --git a/filter.js b/filter.js index 8278ebf..d1175a0 100644 --- a/filter.js +++ b/filter.js @@ -1,13 +1,10 @@ -function filter(toFilter, type){ - let exp; - - if(type=="barcode"){ - exp = /^A0A3B82[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]$/ - } - if(type=="shelving"){ - exp = /^[A-Z][A-Z][A-Z]$/ - } +function filterBarcode(toFilter){ + const exp = /^A0A3B82[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]$/ return exp.test(toFilter) } -console.log(filter("A0A3B820690FF", "barcode")) - +function filterShelving(toFilter){ + const exp = /^[A-F][A-F][A-F]$/ + return exp.test(toFilter) +} +exports.filterBarcode = filterBarcode; +exports.filterShelving = filterShelving; \ No newline at end of file diff --git a/insertTicket.js b/insertTicket.js new file mode 100644 index 0000000..7d10018 --- /dev/null +++ b/insertTicket.js @@ -0,0 +1,39 @@ +function insertTicket(sql, shelving){ + const config = require('./config'); + const got = require('got'); + (async() => { + const info = await config.info + let key = info.data.token + let currentUser = info.data.currentUser; + (async() => { + for(var i=0;i { - const info = await config.info - let key = info.data.token - let currentUser = info.data.currentUser; - (async() => { - for(var i=0;i