Errores solucionados
This commit is contained in:
parent
f8cd8ee776
commit
f7ec186a77
|
@ -73,7 +73,7 @@ export default class Autocomplete extends Component {
|
||||||
let skip = 0;
|
let skip = 0;
|
||||||
|
|
||||||
if (textFilter)
|
if (textFilter)
|
||||||
where[this.showField] = {ilike: textFilter};
|
where[this.showField] = {regexp: textFilter};
|
||||||
if (append && this.data)
|
if (append && this.data)
|
||||||
skip = this.data.length;
|
skip = this.data.length;
|
||||||
|
|
||||||
|
|
|
@ -23,15 +23,15 @@ export default class Textfield extends Component {
|
||||||
clearButton.addEventListener('mousedown',
|
clearButton.addEventListener('mousedown',
|
||||||
event => event.preventDefault());
|
event => event.preventDefault());
|
||||||
|
|
||||||
// input.value = ' ';
|
|
||||||
let div = this.element.firstChild;
|
let div = this.element.firstChild;
|
||||||
componentHandler.upgradeElement(div);
|
componentHandler.upgradeElement(div);
|
||||||
}
|
}
|
||||||
link($scope, $attrs) {
|
link($scope, $attrs) {
|
||||||
let mdlTextField = this.element.firstChild.MaterialTextfield;
|
let mdlTextField = this.element.firstChild.MaterialTextfield;
|
||||||
|
mdlTextField.updateClasses_();
|
||||||
|
|
||||||
$scope.$watch($attrs.model,
|
$scope.$watch($attrs.model,
|
||||||
() => mdlTextField.updateClasses_());
|
() => mdlTextField.updateClasses_());
|
||||||
mdlTextField.updateClasses_();
|
|
||||||
}
|
}
|
||||||
onClearClick() {
|
onClearClick() {
|
||||||
this.input.value = '';
|
this.input.value = '';
|
||||||
|
|
10
dev.cmd
10
dev.cmd
|
@ -14,17 +14,15 @@ goto caseUsage
|
||||||
echo "################################ Starting services"
|
echo "################################ Starting services"
|
||||||
if not exist "%nginxPrefix%\temp" (mkdir "%nginxPrefix%\temp")
|
if not exist "%nginxPrefix%\temp" (mkdir "%nginxPrefix%\temp")
|
||||||
start /I nginx -c "%nginxConf%" -p "%nginxPrefix%"
|
start /I nginx -c "%nginxConf%" -p "%nginxPrefix%"
|
||||||
call forever --minUptime 1000 --spinSleepTime 1000 start forever.json
|
node dev.js
|
||||||
gulp --gulpfile gulpfile.js
|
goto caseEnd
|
||||||
goto caseExit
|
|
||||||
|
|
||||||
:caseStop
|
:caseStop
|
||||||
echo "################################ Stoping services"
|
echo "################################ Stoping services"
|
||||||
if exist "%nginxPrefix%\temp\nginx.pid" (nginx -c "%nginxConf%" -p "%nginxPrefix%" -s stop)
|
if exist "%nginxPrefix%\temp\nginx.pid" (nginx -c "%nginxConf%" -p "%nginxPrefix%" -s stop)
|
||||||
forever stopall
|
goto caseEnd
|
||||||
goto caseExit
|
|
||||||
|
|
||||||
:caseUsage
|
:caseUsage
|
||||||
echo "Usage: %0 [start|stop]"
|
echo "Usage: %0 [start|stop]"
|
||||||
|
|
||||||
:caseExit
|
:caseEnd
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
require('./gulpfile');
|
||||||
|
var auth = require('./services/auth/server/server.js');
|
||||||
|
var client = require('./services/client/server/server.js');
|
||||||
|
var server = require('./services/salix/server/server.js');
|
||||||
|
var gulp = require('gulp');
|
||||||
|
|
||||||
|
gulp.start(['default']);
|
||||||
|
|
||||||
|
auth.start();
|
||||||
|
client.start();
|
||||||
|
server.start();
|
4
dev.sh
4
dev.sh
|
@ -13,12 +13,10 @@ case "$1" in
|
||||||
$0 stop
|
$0 stop
|
||||||
echo "################################ Starting services"
|
echo "################################ Starting services"
|
||||||
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
|
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
|
||||||
forever --minUptime 1000 --spinSleepTime 1000 start forever.json
|
node dev.js
|
||||||
gulp --gulpfile gulpfile.js
|
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
echo "################################ Stoping services"
|
echo "################################ Stoping services"
|
||||||
forever stopall
|
|
||||||
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix" -s stop
|
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix" -s stop
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"auth": {
|
"auth": {
|
||||||
"name": "mysql",
|
"name": "mysql",
|
||||||
"connector": "mysql",
|
"connector": "mysql",
|
||||||
"database": "auth",
|
"database": "salix",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
"port": 3306,
|
"port": 3306,
|
||||||
|
|
|
@ -8,9 +8,9 @@ var app = module.exports = loopback();
|
||||||
|
|
||||||
// modificado
|
// modificado
|
||||||
app.set('view engine', 'ejs');
|
app.set('view engine', 'ejs');
|
||||||
app.set('views',path.join(__dirname,'../client'));
|
app.set('views', path.join(__dirname,'../client'));
|
||||||
app.use(loopback.static(path.resolve(__dirname, '../client')));
|
app.use(loopback.static(path.resolve(__dirname, '../client')));
|
||||||
app.set('applications',require("./application.json"));
|
app.set('applications', require("./application.json"));
|
||||||
// fin
|
// fin
|
||||||
|
|
||||||
app.start = function() {
|
app.start = function() {
|
||||||
|
|
|
@ -80,12 +80,12 @@ module.exports = function(Client) {
|
||||||
return {
|
return {
|
||||||
where: {
|
where: {
|
||||||
id: p.id,
|
id: p.id,
|
||||||
name: {ilike: p.name},
|
name: {regexp: p.name},
|
||||||
cif: p.cif,
|
cif: p.cif,
|
||||||
socialName: {ilike: p.socialName},
|
socialName: {regexp: p.socialName},
|
||||||
city: {ilike: p.city},
|
city: {regexp: p.city},
|
||||||
postcode: p.postcode,
|
postcode: p.postcode,
|
||||||
email: {ilike: p.email},
|
email: {regexp: p.email},
|
||||||
phone: p.phone
|
phone: p.phone
|
||||||
},
|
},
|
||||||
skip: (p.page - 1) * p.size,
|
skip: (p.page - 1) * p.size,
|
||||||
|
|
|
@ -88,6 +88,12 @@
|
||||||
"invoiceByEmail": {
|
"invoiceByEmail": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Send invoices by email"
|
"description": "Send invoices by email"
|
||||||
|
},
|
||||||
|
"payMethod": {
|
||||||
|
"type": "Number"
|
||||||
|
},
|
||||||
|
"salesPerson": {
|
||||||
|
"type": "Number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"validations": [],
|
"validations": [],
|
||||||
|
|
|
@ -16,6 +16,12 @@
|
||||||
"creationDate": {
|
"creationDate": {
|
||||||
"type": "date",
|
"type": "date",
|
||||||
"description": "Creation Date"
|
"description": "Creation Date"
|
||||||
|
},
|
||||||
|
"client": {
|
||||||
|
"type": "Number"
|
||||||
|
},
|
||||||
|
"salesPerson": {
|
||||||
|
"type": "Number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"auth": {
|
"auth": {
|
||||||
"name": "mysql",
|
"name": "mysql",
|
||||||
"connector": "mysql",
|
"connector": "mysql",
|
||||||
"database": "auth",
|
"database": "salix",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
"port": 3306,
|
"port": 3306,
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
"vn": {
|
"vn": {
|
||||||
"name": "mysql",
|
"name": "mysql",
|
||||||
"connector": "mysql",
|
"connector": "mysql",
|
||||||
"database": "vn",
|
"database": "salix",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "localhost",
|
"host": "localhost",
|
||||||
"port": 3306,
|
"port": 3306,
|
||||||
|
|
Loading…
Reference in New Issue