finish select client group in client list , WIP create or update group name, WIP create or update client group discount
This commit is contained in:
parent
b58c75fdbb
commit
56a3ba3e2f
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -34,7 +34,7 @@ class Bdd {
|
|||||||
"injection", "injection_diffusion", "injection_qte", "preinjection", "preinjection_qte", "coinjection", "coinjection_qte",
|
"injection", "injection_diffusion", "injection_qte", "preinjection", "preinjection_qte", "coinjection", "coinjection_qte",
|
||||||
"drainage", "drainage_qte", "drainage_etat", "ponction", "ponction_qte", "cavite", "cavite_qte", "desinfection", "lavage",
|
"drainage", "drainage_qte", "drainage_etat", "ponction", "ponction_qte", "cavite", "cavite_qte", "desinfection", "lavage",
|
||||||
"rasage", "presentation_cosmetique", "presentation_sur", "hypodermiques", "hypodermiques_sur", "local", "local_sur", "contenu",
|
"rasage", "presentation_cosmetique", "presentation_sur", "hypodermiques", "hypodermiques_sur", "local", "local_sur", "contenu",
|
||||||
"commentaire", "designation", "hypodermiques_text1", "hypodermiques_text2", "qte", "endroit");
|
"commentaire", "designation", "hypodermiques_text1", "hypodermiques_text2", "qte", "endroit","fk_client_group_id");
|
||||||
$this->whiteTable = array("client", "lieu", "trajet", "devis", "produit_devis", "facture", "produit", "configuration", "ligne_trajet", "thanato", "article", "defunt", "article_devis", "bibliotheque", "bijou_defunt", "obs_defunt", "hypo_defunt");
|
$this->whiteTable = array("client", "lieu", "trajet", "devis", "produit_devis", "facture", "produit", "configuration", "ligne_trajet", "thanato", "article", "defunt", "article_devis", "bibliotheque", "bijou_defunt", "obs_defunt", "hypo_defunt");
|
||||||
$this->tableprefix = '*PREFIX*' ."gestion_";
|
$this->tableprefix = '*PREFIX*' ."gestion_";
|
||||||
$this->pdo = $db;
|
$this->pdo = $db;
|
||||||
|
|||||||
@ -14,6 +14,7 @@ import { Thanatopracteur } from "../objects/thanatopracteur.mjs";
|
|||||||
import { Article } from "../objects/article.mjs";
|
import { Article } from "../objects/article.mjs";
|
||||||
import { Defunt } from "../objects/defunt.mjs";
|
import { Defunt } from "../objects/defunt.mjs";
|
||||||
import { Bibliotheque } from "../objects/bibliotheque.mjs";
|
import { Bibliotheque } from "../objects/bibliotheque.mjs";
|
||||||
|
import { ClientGroup } from '../objects/clientGroup.mjs';
|
||||||
|
|
||||||
var choose_folder = t('gestion', 'Choose work folder');
|
var choose_folder = t('gestion', 'Choose work folder');
|
||||||
|
|
||||||
@ -52,7 +53,11 @@ document.body.addEventListener('click', e => {
|
|||||||
Thanatopracteur.loadThanatoList_tid(e);
|
Thanatopracteur.loadThanatoList_tid(e);
|
||||||
}else if(e.target.className.includes("loadSelect_listlieu")){
|
}else if(e.target.className.includes("loadSelect_listlieu")){
|
||||||
Lieu.loadLieuList_lid(e);
|
Lieu.loadLieuList_lid(e);
|
||||||
}else if(e.target.className.includes("loadSelect_listdevis")){
|
}
|
||||||
|
else if(e.target.className.includes("selectClientGroupList")){
|
||||||
|
ClientGroup.loadClientGroupListToSelect(e);
|
||||||
|
}
|
||||||
|
else if(e.target.className.includes("loadSelect_listdevis")){
|
||||||
Devis.loadDevisList_dnum(e);
|
Devis.loadDevisList_dnum(e);
|
||||||
}else if(e.target.className.includes("loadSelect_listalldevis")){
|
}else if(e.target.className.includes("loadSelect_listalldevis")){
|
||||||
Devis.loadAllDevisList_dnum(e);
|
Devis.loadAllDevisList_dnum(e);
|
||||||
|
|||||||
@ -17,6 +17,12 @@ export class Client {
|
|||||||
this.mail = ((myresp.mail.length === 0) ? '-' : myresp.mail);
|
this.mail = ((myresp.mail.length === 0) ? '-' : myresp.mail);
|
||||||
this.adresse = ((myresp.adresse.length === 0) ? '-' : myresp.adresse);
|
this.adresse = ((myresp.adresse.length === 0) ? '-' : myresp.adresse);
|
||||||
this.clientGroupName = ((myresp.client_group_name.length === 0) ? '-' : myresp.client_group_name);
|
this.clientGroupName = ((myresp.client_group_name.length === 0) ? '-' : myresp.client_group_name);
|
||||||
|
|
||||||
|
let clientGroupId = 0;
|
||||||
|
if(myresp.fk_client_group_id != null && myresp.fk_client_group_id.length > 0){
|
||||||
|
clientGroupId = myresp.fk_client_group_id
|
||||||
|
}
|
||||||
|
this.clientGroupId = clientGroupId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,7 +39,7 @@ export class Client {
|
|||||||
'<div class="editable" data-table="client" data-column="telephone" data-id="' + this.id + '">' + this.telephone + '</div>',
|
'<div class="editable" data-table="client" data-column="telephone" data-id="' + this.id + '">' + this.telephone + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="mail" data-id="' + this.id + '">' + this.mail + '</div>',
|
'<div class="editable" data-table="client" data-column="mail" data-id="' + this.id + '">' + this.mail + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="adresse" data-id="' + this.id + '">' + this.adresse + '</div>',
|
'<div class="editable" data-table="client" data-column="adresse" data-id="' + this.id + '">' + this.adresse + '</div>',
|
||||||
'<div class="editable" data-table="client" data-column="clientGroup" data-id="' + this.id + '">' + this.clientGroupName + '</div>',
|
'<div class="selectClientGroupList" data-table="client" data-column="fk_client_group_id" data-id="' + this.id + '" data-current="' + this.clientGroupId + '">' + this.clientGroupName + '</div>',
|
||||||
'<center><div data-modifier="client" data-id=' + this.id + ' data-table="client" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div></center>'
|
'<center><div data-modifier="client" data-id=' + this.id + ' data-table="client" style="display:inline-block;margin-right:0px;" class="deleteItem icon-delete"></div></center>'
|
||||||
];
|
];
|
||||||
return myrow;
|
return myrow;
|
||||||
@ -130,32 +136,6 @@ export class Client {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
// static loadClientList() {
|
|
||||||
// Client.getClients(function (response) {
|
|
||||||
// var listClients = document.querySelectorAll(".listClient");
|
|
||||||
|
|
||||||
// listClients.forEach(selectElement => {
|
|
||||||
// removeOptions(selectElement);
|
|
||||||
// var option = document.createElement("option");
|
|
||||||
// option.value = 0;
|
|
||||||
// option.text = t('gestion', 'Choose customer');
|
|
||||||
// selectElement.appendChild(option);
|
|
||||||
|
|
||||||
// JSON.parse(response).forEach(myresp => {
|
|
||||||
// var option = document.createElement("option");
|
|
||||||
// option.value = myresp.id;
|
|
||||||
// option.text = myresp.prenom + ' ' + myresp.nom;
|
|
||||||
// selectElement.appendChild(option);
|
|
||||||
// });
|
|
||||||
|
|
||||||
// checkSelectPurJs(selectElement);
|
|
||||||
// });
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param {*} cid
|
* @param {*} cid
|
||||||
@ -205,4 +185,5 @@ export class Client {
|
|||||||
e.target.appendChild(selectElement);
|
e.target.appendChild(selectElement);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import { showError } from "@nextcloud/dialogs";
|
import { showError } from "@nextcloud/dialogs";
|
||||||
import { baseUrl, cur, LoadDT, showDone } from "../modules/mainFunction.mjs";
|
import { baseUrl, checkSelectPurJs, LoadDT, showDone } from "../modules/mainFunction.mjs";
|
||||||
|
import { updateDB } from "../modules/ajaxRequest.mjs";
|
||||||
|
|
||||||
export class ClientGroup {
|
export class ClientGroup {
|
||||||
|
|
||||||
@ -60,4 +61,70 @@ export class ClientGroup {
|
|||||||
};
|
};
|
||||||
oReq.send();
|
oReq.send();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static getClientGroups(callback){
|
||||||
|
var oReq = new XMLHttpRequest();
|
||||||
|
oReq.open('PROPFIND', baseUrl + '/getClientGroups', true);
|
||||||
|
oReq.setRequestHeader("Content-Type", "application/json");
|
||||||
|
oReq.onload = function(e){
|
||||||
|
if (this.status == 200) {
|
||||||
|
callback(JSON.parse(this.response));
|
||||||
|
}else{
|
||||||
|
showError(this.response);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
oReq.send();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param {*} lid
|
||||||
|
*/
|
||||||
|
static loadClientGroupListToSelect(e){
|
||||||
|
ClientGroup.getClientGroups(response => {
|
||||||
|
|
||||||
|
var selectElement = document.createElement("select");
|
||||||
|
selectElement.dataset.current = e.target.dataset.current;
|
||||||
|
selectElement.dataset.id = e.target.dataset.id;
|
||||||
|
selectElement.dataset.old = e.target.innerHTML;
|
||||||
|
|
||||||
|
selectElement.addEventListener("change", el=>{
|
||||||
|
if(el.target.value != 0){
|
||||||
|
updateDB(el.target.parentElement.dataset.table,
|
||||||
|
el.target.parentElement.dataset.column,
|
||||||
|
el.target.value,
|
||||||
|
el.target.parentElement.dataset.id
|
||||||
|
);
|
||||||
|
|
||||||
|
// location.reload();
|
||||||
|
|
||||||
|
var parentElement = el.target.parentElement
|
||||||
|
parentElement.innerHTML = el.target.options[el.target.selectedIndex].text;
|
||||||
|
parentElement.dataset.current = el.target.value;
|
||||||
|
}else{
|
||||||
|
var parentElement = el.target.parentElement
|
||||||
|
parentElement.innerHTML = el.target.dataset.old
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
var option = document.createElement("option");
|
||||||
|
option.value = 0;
|
||||||
|
option.text = t('gestion', 'Cancel');
|
||||||
|
selectElement.appendChild(option);
|
||||||
|
|
||||||
|
JSON.parse(response).forEach(myresp => {
|
||||||
|
var txt = document.createElement("textarea");
|
||||||
|
txt.innerHTML = myresp.client_group_name;
|
||||||
|
var option = document.createElement("option");
|
||||||
|
option.value = myresp.id;
|
||||||
|
option.text = txt.value;
|
||||||
|
selectElement.appendChild(option);
|
||||||
|
});
|
||||||
|
|
||||||
|
checkSelectPurJs(selectElement);
|
||||||
|
|
||||||
|
e.target.innerHTML = ''
|
||||||
|
e.target.appendChild(selectElement);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user