diff --git a/src/components/Abonnement.js b/src/components/Abonnement.js
index acb09c1..9117bce 100644
--- a/src/components/Abonnement.js
+++ b/src/components/Abonnement.js
@@ -52,10 +52,10 @@ function Abonnement(props) {
const columns = [
{ field: 'id', headerName: 'id', hide: true },
- { field: 'num_facture', headerName: 'Num Facture', width: 200, hideable: false, flex: 1 },
- { field: 'client_nom', headerName: 'Client', width: 200, hideable: false, flex: 1 },
- { field: 'montant_ht', headerName: 'Montant HT €', width: 200, hideable: false, flex: 1 },
- { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, hideable: false, flex: 1 },
+ { field: 'num_facture', headerName: 'Num Facture', width: 200, flex: 1 },
+ { field: 'client_nom', headerName: 'Client', width: 200, flex: 1 },
+ { field: 'montant_ht', headerName: 'Montant HT €', width: 200, flex: 1 },
+ { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, flex: 1 },
{ field: 'reduction', headerName: 'Discount', width: 150, flex: 1 },
{ field: 'date_facture', headerName: 'Date Facture', width: 150, flex: 1 },
{ field: 'mode_payement', headerName: 'Mode paiement', width: 150, flex: 1 },
diff --git a/src/components/Config_Champs_Personnalise.js b/src/components/Config_Champs_Personnalise.js
index e1f85d9..73d6974 100644
--- a/src/components/Config_Champs_Personnalise.js
+++ b/src/components/Config_Champs_Personnalise.js
@@ -49,9 +49,9 @@ const Config_Champs_Personnalise = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'field_name', headerName: 'Nom champ', hideable: false, flex: 1 },
- { field: 'field_label', headerName: 'label', hideable: false, flex: 1 },
- { field: 'related_collection', headerName: 'Entité metier', width: 150, hideable: false, },
+ { field: 'field_name', headerName: 'Nom champ', flex: 1 },
+ { field: 'field_label', headerName: 'label', flex: 1 },
+ { field: 'related_collection', headerName: 'Entité metier', width: 150, },
{
field: 'is_displayed', headerName: 'Affichable', width: 150, hide: false, editable: false,
valueFormatter: (params) => {
diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js
index 215de89..6c56c73 100644
--- a/src/components/Config_Document.js
+++ b/src/components/Config_Document.js
@@ -77,9 +77,9 @@ const Config_Documents = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'nom', headerName: 'nom', hideable: false, minWidth: 150, flex: 1, },
- { field: 'ref_interne', headerName: 'ref_interne', hideable: false, minWidth: 50, maxWidth: 200, flex: 1, },
- { field: 'type_doc', headerName: 'type_doc', minWidth: 50, maxWidth: 100, flex: 1, hideable: false, },
+ { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, },
+ { field: 'ref_interne', headerName: 'ref_interne', minWidth: 50, maxWidth: 200, flex: 1, },
+ { field: 'type_doc', headerName: 'type_doc', minWidth: 50, maxWidth: 100, flex: 1, },
{ field: 'cible', headerName: 'cible', minWidth: 100, maxWidth: 150, flex: 1, hide: false, editable: false },
{ field: 'default', headerName: 'par default', minWidth: 100, maxWidth: 100, flex: 1, hide: false, editable: false },
{ field: 'sujet', headerName: 'sujet', hide: false, editable: false, minWidth: 150, flex: 1, },
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js
index 3ba2bc8..5db84b9 100644
--- a/src/components/DisplayPartnerSession.js
+++ b/src/components/DisplayPartnerSession.js
@@ -199,9 +199,9 @@ const DisplayPartnerSession = (props) => {
},
{ field: 'class_external_code', headerName: 'Code Formation', align: "center", hideable: true, flex: 1, hide: true, minWidth: 150, renderCell: (params) => , },
{ field: 'date_debut', headerName: 'Debut', hide: false, minWidth: 150, renderCell: (params) => , },
- { field: 'date_fin', headerName: 'Fin', hideable: false, minWidth: 150, renderCell: (params) => , },
+ { field: 'date_fin', headerName: 'Fin', minWidth: 150, renderCell: (params) => , },
{
- field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2,
+ field: 'distantiel', headerName: 'Distantiel', width: datagrid_columns_size_model2,
renderCell: (cellValues) => {
return (
@@ -260,15 +260,15 @@ const DisplayPartnerSession = (props) => {
renderCell: (params) => ,
},
{ field: 'title', headerName: 'Formation', minWidth: 250, flex: 1, align: "center", hide: true, hideable: true, renderCell: (params) => , },
- { field: 'domaine', headerName: 'Domaine', minWidth: datagrid_columns_size_model1, align: "center", hide: true, hideable: false, renderCell: (params) => , },
- { field: 'published', headerName: 'publié', minWidth: datagrid_columns_size_model1, align: "center", hide: true, hideable: false, renderCell: (params) => , },
+ { field: 'domaine', headerName: 'Domaine', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , },
+ { field: 'published', headerName: 'publié', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , },
{ field: 'site_formation_id', headerName: 'site_formation_id', with: 0, align: "center", hide: true, hideable: false },
- { field: 'site_formation_nom', headerName: 'Site Ftion', with: 150, align: "center", hide: false, hideable: false, renderCell: (params) => , },
+ { field: 'site_formation_nom', headerName: 'Site Ftion', with: 150, align: "center", hide: false, renderCell: (params) => , },
- { field: 'duration', headerName: 'Durée', minWidth: datagrid_columns_size_model2, align: "center", hide: true, hideable: false, renderCell: (params) => , },
+ { field: 'duration', headerName: 'Durée', minWidth: datagrid_columns_size_model2, align: "center", hide: true, renderCell: (params) => , },
{
field: "Detail", headerName: 'Voir détail',
renderCell: (cellValues) => {
@@ -360,13 +360,13 @@ const DisplayPartnerSession = (props) => {
{ field: 'civilite', headerName: 'Civ.', minWidth: 70, flex: 1, maxWidth: 100, hide: false, editable: false, editable: false },
{ field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , },
{ field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , },
- { field: 'email', headerName: 'email', minWidth: 150, flex: 1, hideable: false, flex: 1, renderCell: (params) => , },
+ { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , },
{ field: 'client_rattachement_nom', headerName: 'Client', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , },
{ field: 'client_rattachement_id', headerName: 'Client_id', Width: 0, hide: true, editable: true, },
{ field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , },
{ field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true },
{ field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true },
- { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', hideable: false, flex: 1, editable: true, renderCell: (params) => , },
+ { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true, renderCell: (params) => , },
{
field: "update", headerName: 'Mise à jour',
renderCell: (cellValues) => {
@@ -618,15 +618,29 @@ const DisplayPartnerSession = (props) => {
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
{ field: 'civilite', headerName: 'Civ.', minWidth: 70, flex: 1, maxWidth: 100, hide: false, editable: false, editable: false },
- { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , },
- { field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , },
- { field: 'email', headerName: 'email', minWidth: 150, flex: 1, hideable: false, flex: 1, renderCell: (params) => , },
+ { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: false, renderCell: (params) => , },
+ { field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: false, renderCell: (params) => , },
+ { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , },
{ field: 'client_rattachement_nom', headerName: 'Client', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , },
- { field: 'client_rattachement_id', headerName: 'Client_id', Width: 0, hide: true, editable: true, },
- { field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true },
- { field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true },
- { field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true },
- { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', hideable: false, flex: 1, editable: true },
+ { field: 'client_rattachement_id', headerName: 'Client_id', Width: 0, hide: true, editable: false, },
+ { field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: false },
+ { field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false },
+ { field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false },
+ { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true },
+
+ {
+ field: 'invoiced', headerName: 'Facturé', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false,
+ valueFormatter: (params) => {
+ if (String(params.value) === "1")
+ return "Oui";
+ else
+ return "Non";
+ },
+ },
+ { field: 'invoiced_ref', headerName: 'Num Fact.', minWidth: 100, flex: 1, maxWidth: 150, flex: 1, editable: false, hide: true, },
+ { field: 'invoiced_date', headerName: 'Date Fact.', minWidth: 100, flex: 1, maxWidth: 150, flex: 1, editable: false, hide: true, },
+
+
{
field: "sendmail", headerName: 'Email Confirmation',
renderCell: (cellValues) => {
@@ -763,11 +777,11 @@ const DisplayPartnerSession = (props) => {
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
{ field: 'date', headerName: 'date', width: 100, hide: true, flex: 1 },
- { field: 'sequence_start', headerName: 'Debut', width: 100, hideable: false, flex: 1 },
- { field: 'sequence_end', headerName: 'Fin', width: 100, hideable: false, flex: 1 },
+ { field: 'sequence_start', headerName: 'Debut', width: 100, flex: 1 },
+ { field: 'sequence_end', headerName: 'Fin', width: 100, flex: 1 },
{ field: 'is_present', headerName: 'Présent', width: 100, hide: false, editable: true, type: 'boolean', },
- { field: 'email', headerName: 'email', width: 250, hideable: false, flex: 1 },
+ { field: 'email', headerName: 'email', width: 250, flex: 1 },
{ field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true },
{ field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false },
@@ -2490,8 +2504,8 @@ const DisplayPartnerSession = (props) => {
Getall_Training_Employee_No_Filter();
Getall_Training_Materiel_No_Filter();
- Get_List_Partner_Financeurs();
- Get_List_Partner_Clients();
+ Get_List_Partner_Financeurs();
+ Get_List_Partner_Clients();
Getall_Partner_Site_Formation();
setaddOneParticipant("1");
@@ -14613,6 +14627,11 @@ const DisplayPartnerSession = (props) => {
client_rattachement_nom: JSON.parse(item).client_rattachement_nom,
client_rattachement_id: JSON.parse(item).client_rattachement_id,
+ invoiced: JSON.parse(item).invoiced,
+ invoiced_ref: JSON.parse(item).invoiced_ref,
+ invoiced_date: JSON.parse(item).invoiced_date,
+
+
}
))}
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js
index 7c03a94..2d69900 100644
--- a/src/components/DisplayPartnerStagiaires.js
+++ b/src/components/DisplayPartnerStagiaires.js
@@ -104,7 +104,7 @@ const DisplayPartnerStagiaires = (props) => {
{ field: 'nom', headerName: 'Nom', minWidth: 200, flex: 1, hide: false, editable: false, editable: false, renderCell: (params) => , },
{ field: 'prenom', headerName: 'Prénom', minWidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , },
- { field: 'email', headerName: 'Email', minWidth: 250, flex: 1, hideable: false, editable: false, renderCell: (params) => , },
+ { field: 'email', headerName: 'Email', minWidth: 250, flex: 1, editable: false, renderCell: (params) => , },
{ field: 'employeur', headerName: 'Employeur', minWidth: 200, hide: true, editable: false },
{ field: 'client_nom', headerName: 'Client', minWidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , },
{
@@ -125,7 +125,7 @@ const DisplayPartnerStagiaires = (props) => {
{ field: 'code_session', headerName: 'Code session', hideable: true, editable: false, minWidth: 150, flex: 1 },
{ field: 'title', headerName: 'Formation', minWidth: datagrid_columns_size_model1, align: "center", hideable: true, editable: false, hide: true },
{
- field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2,
+ field: 'distantiel', headerName: 'Distantiel', width: datagrid_columns_size_model2,
valueFormatter: (params) => {
if (String(params.value) === "0")
return "Non";
@@ -151,6 +151,20 @@ const DisplayPartnerStagiaires = (props) => {
{ field: 'date_debut', headerName: 'Du', minWidth: 90, maxWidth: 100, flex: 1, hideable: true, editable: false },
{ field: 'date_fin', headerName: 'Au', minWidth: 90, maxWidth: 100, flex: 1, hideable: true, editable: false },
{ field: 'class_internal_url', headerName: 'class_internal_url', hide: true, editable: false },
+
+ {
+ field: 'invoiced', headerName: 'Facturé', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false,
+ valueFormatter: (params) => {
+ if (String(params.value) === "1")
+ return "Oui";
+ else
+ return "Non";
+ },
+ },
+ { field: 'invoiced_ref', headerName: 'Num Fact.', minWidth: 100, flex: 1, maxWidth: 150, flex: 1, editable: false, hide: true, },
+ { field: 'invoiced_date', headerName: 'Date Fact.', minWidth: 100, flex: 1, maxWidth: 150, flex: 1, editable: false, hide: true, },
+
+
{
field: "Detail", headerName: 'Voir detail',
renderCell: (cellValues) => {
@@ -1091,7 +1105,7 @@ const DisplayPartnerStagiaires = (props) => {
if (document.getElementsByName("detail_client_rattachement") && document.getElementsByName("detail_client_rattachement")[0])
document.getElementsByName("detail_client_rattachement")[0].value = "";
- if (document.getElementsByName("detail_financeur_rattachement") && document.getElementsByName("detail_financeur_rattachement")[0])
+ if (document.getElementsByName("detail_financeur_rattachement") && document.getElementsByName("detail_financeur_rattachement")[0])
document.getElementsByName("detail_financeur_rattachement")[0].value = "";
if (document.getElementsByName("detail_session_class") && document.getElementsByName("detail_session_class")[0])
@@ -1229,7 +1243,7 @@ const DisplayPartnerStagiaires = (props) => {
if (document.getElementsByName("one_detail_client_rattachement") && document.getElementsByName("one_detail_client_rattachement")[0])
document.getElementsByName("one_detail_client_rattachement")[0].value = "";
- if (document.getElementsByName("one_detail_financeur_rattachement") && document.getElementsByName("one_detail_financeur_rattachement")[0])
+ if (document.getElementsByName("one_detail_financeur_rattachement") && document.getElementsByName("one_detail_financeur_rattachement")[0])
document.getElementsByName("one_detail_financeur_rattachement")[0].value = "";
@@ -6686,8 +6700,9 @@ const DisplayPartnerStagiaires = (props) => {
ville: JSON.parse(item).ville,
pays: JSON.parse(item).pays,
-
-
+ invoiced: JSON.parse(item).invoiced,
+ invoiced_ref: JSON.parse(item).invoiced_ref,
+ invoiced_date: JSON.parse(item).invoiced_date,
}
))}
@@ -7824,36 +7839,36 @@ const DisplayPartnerStagiaires = (props) => {
{New_Get_List_Partner_Financeurs_result && New_Get_List_Partner_Financeurs_result.length > 0 &&
- String(participant_data_edit_mode) === "1" &&
Financeur
+ String(participant_data_edit_mode) === "1" &&
Financeur
-
{
- if (value && value._id) {
- setp_detail_financeur_rattachement_id(value._id);
- setp_detail_financeur_rattachement_nom(value.nom);
+ {
+ if (value && value._id) {
+ setp_detail_financeur_rattachement_id(value._id);
+ setp_detail_financeur_rattachement_nom(value.nom);
- setparticipant_data_changed("1");
- Dialog_1_handle_change_participant_session(" Attention, vous allez modifier l'organisme financeur du participant");
+ setparticipant_data_changed("1");
+ Dialog_1_handle_change_participant_session(" Attention, vous allez modifier l'organisme financeur du participant");
+ }
+ }}
+ value={p_detail_financeur_rattachement_nom}
+
+ renderInput={(params) =>
}
- }}
- value={p_detail_financeur_rattachement_nom}
-
- renderInput={(params) =>
- }
- />
- }
+
}
{String(participant_data_edit_mode) !== "1" && Financeur
{
{ field: 'zone_diffusion', headerName: 'zone_diffusion', hide: true, maxWidth: 1, editable: false, },
{ field: 'internal_url', headerName: 'internal_url', hide: true, editable: false, },
- { field: 'external_code', headerName: 'Code Formation', hideable: false, minWidth: 150, flex: 1, maxWidth: 250, editable: false, renderCell: (params) => , },
- { field: 'title', headerName: 'Titre', hideable: false, minWidth: 300, flex: 1, editable: false, renderCell: (params) => , },
+ { field: 'external_code', headerName: 'Code Formation', minWidth: 150, flex: 1, maxWidth: 250, editable: false, renderCell: (params) => , },
+ { field: 'title', headerName: 'Titre', minWidth: 300, flex: 1, editable: false, renderCell: (params) => , },
{ field: 'domain', headerName: 'Domaine', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, editable: false, renderCell: (params) => , },
{ field: 'metier', headerName: 'Métier', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, hide: true, editable: false, renderCell: (params) => , },
{ field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", renderCell: (params) => , },
diff --git a/src/components/DisplayUserGoals.js b/src/components/DisplayUserGoals.js
index a52f7c5..69da40b 100644
--- a/src/components/DisplayUserGoals.js
+++ b/src/components/DisplayUserGoals.js
@@ -19,8 +19,8 @@ function DisplayUserGoals(props) {
{ field: 'id', headerName: 'id', hide: true },
{ field: 'name', headerName: 'Nom', },
{ field: 'description', headerName: 'Description', width: 200, },
- { field: 'domaine', headerName: 'Domaine', width: 200, hideable: false, flex: 1 },
- { field: 'niveau', headerName: 'Niveau', hideable: false, flex: 1 },
+ { field: 'domaine', headerName: 'Domaine', width: 200, flex: 1 },
+ { field: 'niveau', headerName: 'Niveau', flex: 1 },
{ field: 'date_souhaite', headerName: ' Date de realisation souhaité', flex: 1 },
{
diff --git a/src/components/Employes.js b/src/components/Employes.js
index 6d56cad..d33c4ec 100644
--- a/src/components/Employes.js
+++ b/src/components/Employes.js
@@ -241,7 +241,7 @@ const Employes = (props) => {
const columns_employee_affectation = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'poste', headerName: 'Poste', flex: 1, hideable: false, },
+ { field: 'poste', headerName: 'Poste', flex: 1, },
{ field: 'date_du', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_au', headerName: 'Au', width: 150, hide: false, },
{ field: 'related_target_collection_object', headerName: 'Cible', flex: 1, hide: false, },
@@ -316,7 +316,7 @@ const Employes = (props) => {
const columns_employee_acces_right = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'module', headerName: 'Module', flex: 1, hideable: false, },
+ { field: 'module', headerName: 'Module', flex: 1, },
{
field: 'read', headerName: 'Lecture', width: 150, hide: false, editable: true, type: 'boolean',
},
@@ -330,7 +330,7 @@ const Employes = (props) => {
const columns_employee_acces_right_v2 = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'module', headerName: 'Module', flex: 1, hideable: false, },
+ { field: 'module', headerName: 'Module', flex: 1, },
{
field: 'read', headerName: 'Lecture', width: 150, hide: false, editable: true, type: 'boolean',
@@ -352,7 +352,7 @@ const Employes = (props) => {
const columns_employee_contrat = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'rh_id', headerName: 'rh_id', flex: 1, hideable: false, hide: true, },
+ { field: 'rh_id', headerName: 'rh_id', flex: 1, hide: true, },
{ field: 'date_debut', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_fin', headerName: 'Au', width: 150, hide: false, },
{ field: 'type_contrat', headerName: 'Type Contrat', flex: 1, hide: false, width: 150, },
@@ -447,7 +447,7 @@ const Employes = (props) => {
const columns_employee_acces_right_disabled = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'module', headerName: 'Module', flex: 1, hideable: false, },
+ { field: 'module', headerName: 'Module', flex: 1, },
{
field: 'read', headerName: 'Lecture', width: 150, hide: false, editable: false, type: 'boolean',
diff --git a/src/components/Facture.js b/src/components/Facture.js
index 276ad97..d191742 100644
--- a/src/components/Facture.js
+++ b/src/components/Facture.js
@@ -41,10 +41,10 @@ function Facture(props) {
const columns = [
{ field: 'id', headerName: 'id', hide: true },
{ field: 'date_facture', headerName: 'Date Facture', width: 150, flex: 1 },
- { field: 'num_facture', headerName: 'Num Facture', width: 200, hideable: false, flex: 1 },
- { field: 'client_nom', headerName: 'Client', width: 200, hideable: false, flex: 1, hide: true },
- { field: 'montant_ht', headerName: 'Montant HT €', width: 200, hideable: false, flex: 1 },
- { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, hideable: false, flex: 1 },
+ { field: 'num_facture', headerName: 'Num Facture', width: 200, flex: 1 },
+ { field: 'client_nom', headerName: 'Client', width: 200, flex: 1, hide: true },
+ { field: 'montant_ht', headerName: 'Montant HT €', width: 200, flex: 1 },
+ { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, flex: 1 },
{ field: 'reduction', headerName: 'Discount', width: 150, flex: 1, hide: true },
{ field: 'mode_payement', headerName: 'Mode paiement', width: 150, flex: 1 },
{ field: 'date_payement', headerName: 'Date échéance', width: 150, flex: 1 },
diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js
index 0dcf95a..5e40003 100644
--- a/src/components/GestionAdministrative.js
+++ b/src/components/GestionAdministrative.js
@@ -65,13 +65,13 @@ function GestionAdministrative(props) {
const columns_preinscrit = [
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
- { field: 'email', headerName: 'email', width: 150, hideable: false, },
+ { field: 'email', headerName: 'email', width: 150, },
{ field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true },
{ field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: true },
{ field: 'employeur', headerName: 'Employeur', width: 200, hide: false, editable: true },
{ field: 'opco', headerName: 'Centre Opco', width: 150, hide: false, editable: true },
{ field: 'modefinancement', headerName: 'Financement', width: 150, hide: false, editable: true },
- { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', hideable: false, flex: 1, editable: true },
+ { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', flex: 1, editable: true },
{
field: "update", headerName: 'Mise à jour',
renderCell: (cellValues) => {
@@ -322,13 +322,13 @@ function GestionAdministrative(props) {
const columns_inscrit = [
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
- { field: 'email', headerName: 'emails', width: 200, hideable: false, flex: 1, minWidth: 150, maxWidth: 300 },
+ { field: 'email', headerName: 'emails', width: 200, flex: 1, minWidth: 150, maxWidth: 300 },
{ field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true, resizable: true },
{ field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: true },
{ field: 'employeur', headerName: 'Employeur', width: 200, hide: false, editable: true },
{ field: 'opco', headerName: 'Centre Opco', width: 150, hide: false, editable: true },
{ field: 'modefinancement', headerName: 'Financement', width: 150, hide: false, editable: true },
- { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', hideable: false, flex: 1, editable: true },
+ { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', flex: 1, editable: true },
{
field: "sendmail", headerName: 'Email Confirmation',
renderCell: (cellValues) => {
@@ -456,11 +456,11 @@ function GestionAdministrative(props) {
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
{ field: 'date', headerName: 'date', width: 100, hide: true, flex: 1 },
- { field: 'sequence_start', headerName: 'Debut', width: 100, hideable: false, flex: 1 },
- { field: 'sequence_end', headerName: 'Fin', width: 100, hideable: false, flex: 1 },
+ { field: 'sequence_start', headerName: 'Debut', width: 100, flex: 1 },
+ { field: 'sequence_end', headerName: 'Fin', width: 100, flex: 1 },
{ field: 'is_present', headerName: 'Présent', width: 100, hide: false, editable: true, type: 'boolean', },
- { field: 'email', headerName: 'email', width: 250, hideable: false, flex: 1 },
+ { field: 'email', headerName: 'email', width: 250, flex: 1 },
{ field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true },
{ field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false },
diff --git a/src/components/Materiel_Salle.js b/src/components/Materiel_Salle.js
index d925372..a0bbf7a 100644
--- a/src/components/Materiel_Salle.js
+++ b/src/components/Materiel_Salle.js
@@ -79,7 +79,7 @@ const Materiel_Salle = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'ref_interne', headerName: 'Ref. Interne', flex: 1, hideable: false, },
+ { field: 'ref_interne', headerName: 'Ref. Interne', flex: 1, },
{ field: 'nom', headerName: 'Nom', flex: 1, hide: false, },
{ field: 'type', headerName: 'Type', width: 0, hide: true, },
@@ -167,7 +167,7 @@ const Materiel_Salle = (props) => {
const columns_materielle_affectation = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'poste', headerName: 'Poste', flex: 1, hideable: false, },
+ { field: 'poste', headerName: 'Poste', flex: 1, },
{ field: 'date_du', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_au', headerName: 'Au', width: 150, hide: false, },
{ field: 'related_target_collection_object', headerName: 'Cible', flex: 1, hide: false, },
@@ -242,7 +242,7 @@ const Materiel_Salle = (props) => {
const columns_ressources_associes = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'poste', headerName: 'Poste', flex: 1, hideable: false, },
+ { field: 'poste', headerName: 'Poste', flex: 1, },
{ field: 'date_du', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_au', headerName: 'Au', width: 150, hide: false, },
{ field: 'related_target_collection_object', headerName: 'Cible', flex: 1, hide: false, },
diff --git a/src/components/Materiels.js b/src/components/Materiels.js
index 72ec69d..4ef0dd5 100644
--- a/src/components/Materiels.js
+++ b/src/components/Materiels.js
@@ -77,7 +77,7 @@ const Materiels = (props) => {
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'ref_interne', headerName: 'Ref. Interne', flex: 1, hideable: false, },
+ { field: 'ref_interne', headerName: 'Ref. Interne', flex: 1, },
{ field: 'nom', headerName: 'Nom', flex: 1, hide: false, },
{ field: 'famille', headerName: 'Famille', flex: 1, hide: false, },
{ field: 'marque', headerName: 'Marque', flex: 1, hide: false, },
@@ -149,7 +149,7 @@ const Materiels = (props) => {
const columns_materielle_affectation = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'poste', headerName: 'Poste', flex: 1, hideable: false, },
+ { field: 'poste', headerName: 'Poste', flex: 1, },
{ field: 'date_du', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_au', headerName: 'Au', width: 150, hide: false, },
{ field: 'related_target_collection_object', headerName: 'Cible', flex: 1, hide: false, },
@@ -224,7 +224,7 @@ const Materiels = (props) => {
const columns_ressources_associes = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'poste', headerName: 'Poste', flex: 1, hideable: false, },
+ { field: 'poste', headerName: 'Poste', flex: 1, },
{ field: 'date_du', headerName: 'Du', width: 150, hide: false, },
{ field: 'date_au', headerName: 'Au', width: 150, hide: false, },
{ field: 'related_target_collection_object', headerName: 'Cible', flex: 1, hide: false, },
diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js
index 75a0ecb..b400ce9 100644
--- a/src/components/Module_Editique.js
+++ b/src/components/Module_Editique.js
@@ -119,6 +119,52 @@ const Module_Editique = (props) => {
};
+ const [Invoice_Session_Formation_api, setInvoice_Session_Formation_api] = useState();
+ const [Invoice_Session_Formation_message, setInvoice_Session_Formation_message] = useState();
+ const [Invoice_Session_Formation_result, setInvoice_Session_Formation_result] = useState([]);
+ function Invoice_Session_Formation(event) {
+ var form = new FormData();
+
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+ form.append("session_id", selected_session_id);
+ form.append("courrier_template_id", "64fde469da3a50338b92fb83");
+
+ form.append("email_test", "");
+ form.append("email_production", "");
+
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Prepare_and_Send_Facture_From_Session_By_Email/";
+
+ setLoading(true);
+ axios.post(myurl, form).then(res => {
+
+ setLoading(false);
+
+ if (String(res.data.status) === String("true")) {
+ //console.log(" In Invoice_Session_Formation res.data.status = " + res.data.status);
+ //console.log(" In Invoice_Session_Formation res.data.message r_class = " + res.data.message);
+ setInvoice_Session_Formation_api("true");
+ setInvoice_Session_Formation_result(res.data.message);
+ alert(res.data.message);
+
+ }
+ else {
+ setInvoice_Session_Formation_api("false");
+ setInvoice_Session_Formation_message(res.data.message);
+ alert(res.data.message);
+ }
+
+ }).catch((error) => {
+ setLoading(false);
+ console.warn('Not good man :( Invoice_Session_Formation = ', error);
+ setInvoice_Session_Formation_api("false");
+ alert(" Impossible lancer la facturation de la session");
+ })
+ }
+
+
+
const [Getall_Editable_Document_By_Partner_By_Collection_api, setGetall_Editable_Document_By_Partner_By_Collection_api] = useState();
@@ -938,14 +984,23 @@ const Module_Editique = (props) => {
const [Dialog_EVALUATION_FORMATION_open, setDialog_EVALUATION_FORMATION_open] = React.useState(false);
const Dialog_EVALUATION_FORMATION_handleClose = () => {
- //alert(" Utiliser le bouton 'fermer' ");
- //setOpen(false);
+
};
const Dialog_EVALUATION_FORMATION_handleClose_buton = () => {
setDialog_EVALUATION_FORMATION_open(false);
};
+
+ const [Dialog_FACTURATION_FORMATION_open, setDialog_FACTURATION_FORMATION_open] = React.useState(false);
+ const Dialog_FACTURATION_FORMATION_handleClose = () => {
+
+ };
+
+ const Dialog_FACTURATION_FORMATION_handleClose_buton = () => {
+ setDialog_FACTURATION_FORMATION_open(false);
+ };
+
return (
@@ -1203,9 +1258,9 @@ const Module_Editique = (props) => {
}
}}
renderInput={(params) =>
+ />
}
/>
@@ -1261,7 +1316,7 @@ const Module_Editique = (props) => {
}
}}
- renderInput={(params) =>
+ renderInput={(params) =>
}
/>
@@ -1530,9 +1585,9 @@ const Module_Editique = (props) => {
}
}}
renderInput={(params) =>
+ />
}
/>
@@ -1589,9 +1644,9 @@ const Module_Editique = (props) => {
}}
renderInput={(params) =>
+ />
}
/>
@@ -1830,10 +1885,69 @@ const Module_Editique = (props) => {
+ {/* Dialog pour gerer les FACTURATION_FORMATION */}
+
+
+ {/* FIN Dialog pour gerer les FACTURATION_FORMATION */}
+
- Action Editique
+
{Getall_Editable_Document_By_Partner_By_Collection_result &&
Getall_Editable_Document_By_Partner_By_Collection_result.map((document) => (
@@ -1880,6 +1994,13 @@ const Module_Editique = (props) => {
setDialog_EVALUATION_FORMATION_open(true);
}
+ else if (String(JSON.parse(document).courrier_template_ref_interne) === "FACTURATION_SESSION") {
+
+ setDialog_FACTURATION_FORMATION_open(true);
+ }
+
+
+
}}>
{(JSON.parse(document).courrier_template_nom)}
diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js
index 9883a28..aa8e2fe 100644
--- a/src/components/Partner_Client.js
+++ b/src/components/Partner_Client.js
@@ -123,7 +123,7 @@ const Partner_Client = (props) => {
{ field: 'raison_sociale', headerName: 'Raison sociale', Width: 200, flex: 1, hide: false, editable: false, renderCell: (params) =>
, },
{ field: 'nom', headerName: 'nom', width: 100, hide: false, editable: false, Width: 200, flex: 1, renderCell: (params) =>
, },
- { field: 'email', headerName: 'email', width: 100, hideable: false, width: 200, flex: 1, renderCell: (params) =>
, },
+ { field: 'email', headerName: 'email', width: 100, width: 200, flex: 1, renderCell: (params) =>
, },
{ field: 'telephone', headerName: 'Téléphone', width: 100, hide: false, editable: false, width: 100, renderCell: (params) =>
, },
{ field: 'adr_adresse', headerName: 'Adresse', width: 100, hide: true, editable: false, width: 100, renderCell: (params) =>
, },
@@ -1017,7 +1017,7 @@ const Partner_Client = (props) => {
{String(Edite_Client) === "1" &&
-
Detail client / Financeur: {Client_email}
+
Detail client / Financeur : {Client_email}
diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js
index 877329d..2d504ac 100644
--- a/src/components/Partner_Commande.js
+++ b/src/components/Partner_Commande.js
@@ -92,9 +92,9 @@ const Partner_Commande = (props) => {
},
},
{ field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true, editable: false },
- { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, hideable: false, flex: 1 },
+ { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, flex: 1 },
{ field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 150, hide: true, editable: false },
- { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, hideable: false, flex: 1, editable: false },
+ { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false },
{ field: 'order_header_date_cmd', headerName: 'Date', width: 150, hide: false, editable: false },
{ field: 'order_header_date_expiration', headerName: 'Date Expiration', width: 150, hide: false, editable: false },
diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js
index 18cea5e..78b4584 100644
--- a/src/components/Partner_Facture.js
+++ b/src/components/Partner_Facture.js
@@ -69,9 +69,9 @@ const Partner_Facture = (props) => {
{ field: 'invoice_date', headerName: 'Date Facture', width: 150, hide: false, editable: false },
{ field: 'order_header_client_id', headerName: 'Client_Id', width: 150, hide: true, editable: false },
- { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, hideable: false, flex: 1 },
+ { field: 'order_header_client_nom', headerName: 'Nom Client', width: 150, flex: 1 },
{ field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 150, hide: true, editable: false },
- { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, hideable: false, flex: 1, editable: false },
+ { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false },
{ field: 'order_header_date_cmd', headerName: 'Date Cmd', width: 150, hide: true, editable: false },
{ field: 'total_header_hors_taxe_after_header_reduction', headerName: 'Montant HT', width: 150, hide: false, editable: false },
{ field: 'order_header_tax_amount', headerName: 'Taxe', width: 150, hide: false, editable: false },
diff --git a/src/components/Partner_Prix_Achat.js b/src/components/Partner_Prix_Achat.js
index fbfa365..c14fbfc 100644
--- a/src/components/Partner_Prix_Achat.js
+++ b/src/components/Partner_Prix_Achat.js
@@ -78,10 +78,10 @@ const Partner_Prix_Achat = (props) => {
{ field: 'date_debut', headerName: 'Début', flex: 1, minWidth: 150, hide: false, editable: false },
- { field: 'date_fin', headerName: 'Fin', flex: 1, minWidth: 150, hideable: false, },
+ { field: 'date_fin', headerName: 'Fin', flex: 1, minWidth: 150, },
{ field: 'periodicite', headerName: 'Périodicité', flex: 1, minWidth: 150, hide: false, editable: false },
{ field: 'fournisseur', headerName: 'Fournisseur', flex: 1, minWidth: 150, hide: true, editable: false },
- { field: 'prix', headerName: 'prix', flex: 1, minWidth: 150, hideable: false, editable: false },
+ { field: 'prix', headerName: 'prix', flex: 1, minWidth: 150, editable: false },
{
diff --git a/src/components/Pricing.js b/src/components/Pricing.js
index 5893f2b..dc1a1b7 100644
--- a/src/components/Pricing.js
+++ b/src/components/Pricing.js
@@ -50,7 +50,7 @@ function Pricing() {
{ field: 'price_line_id', headerName: '_id', hide: true },
{ field: 'client', headerName: 'Client', width: 150, flex: 1 },
{ field: 'client_recid', headerName: 'Client Id', width: 150, hide: true },
- { field: 'discount', headerName: 'Réduction (%)', width: 100, hideable: false, flex: 1 },
+ { field: 'discount', headerName: 'Réduction (%)', width: 100, flex: 1 },
{ field: 'date_debut', headerName: 'Date début', width: 150, flex: 1 },
{ field: 'date_fin', headerName: 'Date Fin', width: 150, flex: 1 },
diff --git a/src/components/UserHistoryRecherche.js b/src/components/UserHistoryRecherche.js
index 73d69a3..f42ccce 100644
--- a/src/components/UserHistoryRecherche.js
+++ b/src/components/UserHistoryRecherche.js
@@ -75,8 +75,8 @@ const UserHistoryRecherche = (props) => {
const columns = [
{ field: 'id', headerName: 'id', hide: true },
- { field: 'search_text', headerName: 'Search Texte', width: 200, hideable: false, flex: 1 },
- { field: 'date', headerName: 'Date', width: 100, hideable: false, flex: 1 },
+ { field: 'search_text', headerName: 'Search Texte', width: 200, flex: 1 },
+ { field: 'date', headerName: 'Date', width: 100, flex: 1 },
]