Merge remote-tracking branch 'refs/remotes/origin/master'

master
Maxence LANONE 2 years ago
commit 06c1f14595

@ -1,13 +1,15 @@
kind: pipeline
name: JTT_CRM_Pipeline
type: docker
name: default
trigger:
event:
- push
steps:
- name: start
image: node
commands:
- npm install
- find -name "*.js"| grep -v "node_modules" | xargs node -c
- name: build
image: node:alpine
commands:
- cd src/
- npm run build

@ -30,15 +30,26 @@ function Dashboard() {
const apiString = '/Contact/LastAdd3/' + Session.get("idUser");
api.get(apiString).then((response) => {
if (response.data.length > 0)
setInfoContactRecent(response.data);
const data = response.data;
if (data.length > 0){
setInfoContactRecent(response.data[0]);
}
else{
setInfoContactRecent("");
}
});
const apiStringKey = '/Sale/KeyNumber/' + Session.get("idUser") + "/" + month + "/" + year;
api.get(apiStringKey).then((response) => {
if (response.data.length > 0)
const data = response.data;
if (data.length > 0){
setDataKey(response.data[0]);
});
}
else{
setDataKey("");
}
});
const apiStringBestCustomer = '/Sale/BestCustomer/' + Session.get("idUser");
api.get(apiStringBestCustomer).then((response) => {
if (response.data.length > 0)

Loading…
Cancel
Save