diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js
index 995ab0e..58cb799 100644
--- a/src/components/AddPartnerClient.js
+++ b/src/components/AddPartnerClient.js
@@ -1,18 +1,18 @@
import React, { useRef, useState, useEffect } from "react";
import TextField from '@mui/material/TextField';
-import MenuItem from '@mui/material/MenuItem';
+
import fileDownload from 'js-file-download';
import 'react-confirm-alert/src/react-confirm-alert.css'; // Import css
import Button from '@mui/material/Button';
import axios from "axios";
-import DeleteIcon from '@mui/icons-material/Delete';
+
import { getCookie, setCookie } from 'react-use-cookie';
-import { AiTwotoneEdit, AiTwotoneSave } from "react-icons/ai";
+import { AiTwotoneSave } from "react-icons/ai";
import { useHistory } from "react-router-dom";
import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
import { IoMdAddCircle, IoIosRemoveCircleOutline } from "react-icons/io";
-import { GrUserAdmin, GrOrderedList } from "react-icons/gr";
+import { GrOrderedList } from "react-icons/gr";
import { Fab } from "@material-ui/core";
import 'react-tooltip/dist/react-tooltip.css'
import { Tooltip } from 'react-tooltip'
@@ -28,14 +28,11 @@ import Autocomplete from '@mui/material/Autocomplete';
import { gridClasses } from '@mui/x-data-grid';
import Link from '@mui/material/Link';
import { PiDotsThree } from "react-icons/pi";
-import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5";
-
+import { IoCloseCircleOutline } from "react-icons/io5";
+import AttachFileIcon from '@mui/icons-material/AttachFile';
import Radio from '@mui/material/Radio';
-import RadioGroup from '@mui/material/RadioGroup';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import FormControl from '@mui/material/FormControl';
-import FormLabel from '@mui/material/FormLabel';
+
const AddParnerClient = (props) => {
const history = useHistory();
const [submenu, setsubmenu] = useState("");
@@ -215,18 +212,7 @@ const AddParnerClient = (props) => {
Enable_invoice_fields();
}
- /*document.getElementById("submenu_factures").style.background = "#d8edfc";
- document.getElementById("submenu_factures").style.color = "#3b3e40";
-
- document.getElementById("submenu_stagiaires").style.background = "#d8edfc";
- document.getElementById("submenu_stagiaires").style.color = "#3b3e40";
-
- document.getElementById("submenu_devis").style.background = "#d8edfc";
- document.getElementById("submenu_devis").style.color = "#3b3e40";
-
- document.getElementById("submenu_cmd").style.background = "#d8edfc";
- document.getElementById("submenu_cmd").style.color = "#3b3e40";
- */
+
document.getElementById("submenu_contact").style.background = "#d8edfc";
document.getElementById("submenu_contact").style.color = "#3b3e40";
@@ -257,25 +243,7 @@ const AddParnerClient = (props) => {
Ceci est super crade, fair eun wait de pour attendre l'afficage avant de desacitcation si on a desactiver, mais bon ... on avance.
*/
await sleep(5);
- /*if (String(formedit_mode_invoice) !== "1") {
- Disable_invoice_fields();
- } else {
- Enable_invoice_fields();
- }*/
-
- /*
- document.getElementById("submenu_factures").style.background = "#d8edfc";
- document.getElementById("submenu_factures").style.color = "#3b3e40";
-
- document.getElementById("submenu_stagiaires").style.background = "#d8edfc";
- document.getElementById("submenu_stagiaires").style.color = "#3b3e40";
-
- document.getElementById("submenu_devis").style.background = "#d8edfc";
- document.getElementById("submenu_devis").style.color = "#3b3e40";
-
- document.getElementById("submenu_cmd").style.background = "#d8edfc";
- document.getElementById("submenu_cmd").style.color = "#3b3e40";
-*/
+
document.getElementById("submenu_donnee_facturation").style.background = "#d8edfc";
document.getElementById("submenu_donnee_facturation").style.color = "#3b3e40";
@@ -370,6 +338,8 @@ const AddParnerClient = (props) => {
document.getElementById("submenu_piece_jointe").style.color = "white";
+ // Refresh affichage des pièces jointes
+ Get_List_Of_All_PJ(props.client_id);
}
@@ -4384,7 +4354,10 @@ const AddParnerClient = (props) => {
diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js
index b3233b8..1bd477e 100644
--- a/src/components/Partner_Commande.js
+++ b/src/components/Partner_Commande.js
@@ -6,22 +6,19 @@ import Button from '@mui/material/Button';
import axios from "axios";
import { getCookie, setCookie } from 'react-use-cookie';
import { useHistory } from "react-router-dom";
-import CheckOut from "./CheckOut";
+
import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid';
import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
-import { Editor } from '@tinymce/tinymce-react';
-import parse from 'html-react-parser';
+
import { FcViewDetails, FcDisapprove } from "react-icons/fc";
import 'react-tooltip/dist/react-tooltip.css';
import { Tooltip } from 'react-tooltip';
-import add_plus from "../mysy_img/plus.png";
-import excel_icone from "../mysy_img/excel_icone.png";
-import participants from "../mysy_img/participants.png";
+
import Autocomplete from '@mui/material/Autocomplete';
import fileDownload from 'js-file-download'
import Popup from 'reactjs-popup';
import 'reactjs-popup/dist/index.css';
-import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint } from "react-icons/fc";
+
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import { format } from 'date-fns'
@@ -29,8 +26,7 @@ import moment from "moment";
import InputAdornment from '@mui/material/InputAdornment';
import { AiFillCloseCircle } from "react-icons/ai";
import Box from '@mui/material/Box';
-import { Typography, LinearProgress, sliderClasses } from '@mui/material';
-import styled from 'styled-components';
+
import { CiTrash } from "react-icons/ci";
import { MdAddCircleOutline, MdRemoveCircleOutline } from "react-icons/md";
import Dialog from '@mui/material/Dialog';
@@ -38,7 +34,7 @@ import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogContentText from '@mui/material/DialogContentText';
import DialogTitle from '@mui/material/DialogTitle';
-import { TransitionProps } from '@mui/material/transitions';
+
import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif";
import { Global } from "recharts";
import { FcAddDatabase } from "react-icons/fc";
@@ -46,6 +42,8 @@ import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5";
import ToggleSwitch from "./ToggleSwitch";
import ToggleSwitch_v2_mysy from "./ToggleSwitch_v2_mysy";
+import Link from '@mui/material/Link';
+import { PiDotsThree } from "react-icons/pi";
const Partner_Commande = (props) => {
@@ -71,13 +69,43 @@ const Partner_Commande = (props) => {
const [p_filtre4, setp_filtre4] = useState();
const [p_filtre4_value, setp_filtre4_value] = useState();
+
+ function ExpandableCell_50({ value }) {
+ const [expanded, setExpanded] = React.useState(false);
+
+ return (
+
+ );
+ }
+
const columns = [
{ field: '_id', headerName: '_id', hide: true },
{ field: 'id', headerName: 'id', hide: true },
- { field: 'order_header_ref_interne', headerName: 'Reference', width: 100, hide: false, editable: false },
+ { field: 'order_header_ref_interne', headerName: 'Reference', maxWidth: 200, minWidth : 180, flex:1, hide: false, editable: false, renderCell: (params) =>
, },
{ field: 'order_header_type', headerName: 'Type', width: 100, hide: false, editable: false },
{
- field: 'order_header_status', headerName: 'Statut', width: 100, hide: false, editable: false,
+ field: 'order_header_status', headerName: 'Statut', maxWidth : 150, flex :1, hide: false, editable: false,
valueFormatter: (params) => {
if (String(params.value) === "-1")
return "Annulé";
@@ -94,12 +122,12 @@ 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, 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, 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 },
+ { field: 'order_header_client_id', headerName: 'Client_Id', width: 0, hide: true, editable: false },
+ { field: 'order_header_client_nom', headerName: 'Nom Client', minWidth: 200, flex: 1 , renderCell: (params) =>
, },
+ { field: 'order_header_vendeur_id', headerName: 'Vendeur Id', width: 0, hide: true, editable: false },
+ { field: 'order_header_vendeur_nom_prenom', headerName: 'Vendeur', width: 150, flex: 1, editable: false, flex:1 },
+ { field: 'order_header_date_cmd', headerName: 'Date', minWidth: 150, hide: false, editable: false, flex: 1 , renderCell: (params) =>
, },
+ { field: 'order_header_date_expiration', headerName: 'Date Expiration', minWidth: 150, hide: false, editable: false },
/* {
@@ -5813,8 +5841,8 @@ const Partner_Commande = (props) => {
- {String(p_detail_header_devis_date_validation).length > 5 &&
}
- {String(p_detail_header_devis_date_envoi).length > 5 &&
}
+ {String(p_detail_header_devis_date_validation).length > 5 &&
}
+ {String(p_detail_header_devis_date_envoi).length > 5 &&
}
{(!p_detail_header_devis_date_validation || String(p_detail_header_devis_date_validation).length < 5) &&
}
diff --git a/src/styles/components/_addpartnerclient.scss b/src/styles/components/_addpartnerclient.scss
index d885590..ef1aed3 100644
--- a/src/styles/components/_addpartnerclient.scss
+++ b/src/styles/components/_addpartnerclient.scss
@@ -11,7 +11,7 @@
color: red;
font-style: italic;
}
-
+
@media only screen and (max-width: 600px) {
@@ -186,6 +186,14 @@
overflow-y: scroll;
padding-right: 1rem !important;
}
+
+
+ .div_row_list_pj {
+ width: 100%;
+ border-left: 3mm ridge rgba(211, 220, 50, .6);
+ float: left;
+ }
+
}
@media only screen and (min-width: 601px) and (max-width: 991px) {
@@ -361,6 +369,12 @@
overflow-y: scroll;
padding-right: 1rem !important;
}
+
+ .div_row_list_pj {
+ width: 50%;
+ border-left: 3mm ridge rgba(211, 220, 50, .6);
+ float: left;
+ }
}
@media only screen and (min-width: 992px) and (max-width: 1199px) {
@@ -536,6 +550,12 @@
overflow-y: scroll;
padding-right: 1rem !important;
}
+
+ .div_row_list_pj {
+ width: 30%;
+ border-left: 3mm ridge rgba(211, 220, 50, .6);
+ float: left;
+ }
}
@media only screen and (min-width: 1200px) {
@@ -714,6 +734,13 @@
overflow-y: scroll;
padding-right: 1rem !important;
}
+
+ .div_row_list_pj {
+ width: 30%;
+ border-left: 3mm ridge rgba(211, 220, 50, .6);
+ float: left;
+ }
+
}
// end media
diff --git a/src/styles/components/_employes.scss b/src/styles/components/_employes.scss
index e2f180d..4346ada 100644
--- a/src/styles/components/_employes.scss
+++ b/src/styles/components/_employes.scss
@@ -2285,7 +2285,7 @@
width: 30%;
border-left: 3mm ridge rgba(211, 220, 50, .6);
float: left;
- }
+ }
.block_competence {
width: 30%;
diff --git a/src/styles/components/_partner_commande.scss b/src/styles/components/_partner_commande.scss
index 768dc69..aebb611 100644
--- a/src/styles/components/_partner_commande.scss
+++ b/src/styles/components/_partner_commande.scss
@@ -275,6 +275,15 @@
height: 2rem !important;
}
+
+
+ .bton_add_sous_menu_cmd_gauche_info {
+ background: #6fb8f7 !important;
+ color: black;
+ width: 100%;
+ height: 2rem !important;
+ }
+
@@ -865,7 +874,14 @@
height: 2rem !important;
}
+
+ .bton_add_sous_menu_cmd_gauche_info {
+ background: #6fb8f7 !important;
+ color: black;
+ width: 100%;
+ height: 2rem !important;
+ }
.bton_put_to_invoice {
background: #d5f38f;
color: black;
@@ -1481,6 +1497,14 @@
height: 2rem !important;
}
+
+
+ .bton_add_sous_menu_cmd_gauche_info {
+ background: #6fb8f7 !important;
+ color: black;
+ width: 100%;
+ height: 2rem !important;
+ }
.bton_put_to_invoice {
background: #d5f38f;
color: black;
@@ -2012,6 +2036,14 @@
height: 2rem !important;
}
+
+ .bton_add_sous_menu_cmd_gauche_info {
+ background: #6fb8f7 !important;
+ color: black;
+ width: 100% !important;
+ height: 2rem !important;
+ }
+
.bton_put_to_invoice {
background: #d5f38f;
color: black;