@banch0u/core-project-test-repository 1.9.6 → 1.9.8

package/dist/components/Select/index.module.scss

@@ -1,12 +1,11 @@
 .select > div {
   padding: 5px 16px !important;
   border-radius: 6px !important;
-  height: 48px;
+  min-height: 48px;
 }
 .select {
   width: 100%;
-  height: auto;
-  height: 48px;
+  min-height: 48px;
   span {
     font-size: 16px !important;
     font-weight: 500 !important;
@@ -17,12 +16,11 @@
 .select_xs > div {
   padding: 5px 16px !important;
   border-radius: 6px !important;
-  height: 26px;
+  min-height: 26px;
 }
 .select_xs {
   width: 100%;
-  height: auto;
-  height: 26px;
+  min-height: 26px;
   span {
     font-size: 16px !important;
     font-weight: 500 !important;
@@ -34,12 +32,11 @@
 .select_sm > div {
   padding: 5px 16px !important;
   border-radius: 6px !important;
-  height: 34px;
+  min-height: 34px;
 }
 .select_sm {
   width: 100%;
-  height: auto;
-  height: 34px;
+  min-height: 34px;
   span {
     font-size: 16px !important;
     font-weight: 500 !important;
@@ -50,12 +47,11 @@
 .select_md > div {
   padding: 5px 16px !important;
   border-radius: 6px !important;
-  height: 42px;
+  min-height: 42px;
 }
 .select_md {
   width: 100%;
-  height: auto;
-  height: 42px;
+  min-height: 42px;
   span {
     font-size: 16px !important;
     font-weight: 500 !important;

package/dist/pages/Platform/constant.js

@@ -27,7 +27,7 @@ export var entryData = [{
 }, {
   id: 4,
   value: "Şəxsi Kabinet",
-  pathname: "".concat(rootUrl, "/account/private"),
+  pathname: "".concat(rootUrl, "/accounts/private"),
   icon: /*#__PURE__*/React.createElement(UserIcon, null),
   scopes: "account"
 }, {

package/dist/pages/Questionnnaires/Questionnaires.module.scss

@@ -193,3 +193,19 @@
   height: 48px;
   width: 100%;
 }
+
+.tree_select > div {
+  padding: 5px 16px !important;
+  border-radius: 6px !important;
+  min-height: 48px;
+}
+.tree_select {
+  width: 100%;
+  min-height: 48px;
+  span {
+    font-size: 16px !important;
+    font-weight: 500 !important;
+    line-height: 24px !important;
+    text-align: left !important;
+  }
+}

package/dist/pages/Questionnnaires/QuestionnairesEmployeeConfigurations/constant.js

@@ -1,9 +1,7 @@
 import React from "react";
-import { Switch, Tooltip } from "antd";
 import style from "../Questionnaires.module.scss";
-import { setDeleteModalVisible } from "../../../store/slices/global";
-import { DeleteIconQ, EditIcon } from "../../../assets/icons";
-export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch, innerW) {
+import { EditIcon } from "../../../assets/icons";
+export var getStreetColumns = function getStreetColumns(onEditClick, innerW) {
   return [{
     title: "№",
     dataIndex: "num",
@@ -12,56 +10,39 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     width: 35
   }, {
     title: "Heyyət üzvü",
-    dataIndex: "EmployeeIds",
+    dataIndex: "EmployeeIds1",
     width: innerW,
-    disabled: true,
+    disabled: false,
     ellipsis: true
   }, {
     title: "Struktur vahidi",
-    dataIndex: "GeneralStructures",
+    dataIndex: "GeneralStructures1",
     width: innerW,
-    disabled: true,
+    disabled: false,
     ellipsis: true
   }, {
     title: "Vəzifələr",
-    dataIndex: "Positions",
+    dataIndex: "Positions1",
     width: innerW,
-    disabled: true,
+    disabled: false,
     ellipsis: true
   }, {
     title: "Məsul şəxs",
-    dataIndex: "PersonInChargeForFuelIds",
+    dataIndex: "PersonInChargeForFuelIds1",
     width: innerW,
-    disabled: true,
+    disabled: false,
     ellipsis: true
   }, {
     title: "İstismar şöbəsinin rəisi",
-    dataIndex: "OperatingManagerIds",
+    dataIndex: "OperatingManagerIds1",
     width: innerW,
-    disabled: true,
+    disabled: false,
     ellipsis: true
-  }, {
-    title: "Status",
-    key: "status",
-    disabled: true,
-    filter: false,
-    render: function render(data) {
-      return /*#__PURE__*/React.createElement(Tooltip, {
-        placement: "top",
-        title: "Statusu d\u0259yi\u015F"
-      }, /*#__PURE__*/React.createElement(Switch, {
-        size: "medium",
-        checked: data === null || data === void 0 ? void 0 : data.isActive,
-        onChange: function onChange(checked) {
-          return onStatusChange(data, checked, dispatch);
-        }
-      }));
-    }
   }, {
     title: "",
     key: "actions",
     showCheckbox: false,
-    width: 80,
+    width: 40,
     render: function render(data) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: style.number
@@ -70,13 +51,11 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
       }, /*#__PURE__*/React.createElement("div", {
         onClick: function onClick() {
           return onEditClick(data);
+        },
+        style: {
+          background: "#DEEAF6"
         }
-      }, /*#__PURE__*/React.createElement(EditIcon, null)), /*#__PURE__*/React.createElement("div", {
-        onClick: function onClick() {
-          onDelete(data === null || data === void 0 ? void 0 : data.id);
-          dispatch(setDeleteModalVisible(true));
-        }
-      }, /*#__PURE__*/React.createElement(DeleteIconQ, null)))));
+      }, /*#__PURE__*/React.createElement(EditIcon, null)))));
     }
   }];
 };

package/dist/pages/Questionnnaires/QuestionnairesEmployeeConfigurations/index.js

@@ -9,7 +9,7 @@ import React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Cookies from "js-cookie";
 import style from "../Questionnaires.module.scss";
-import { Form, Layout, Select as AntdSelect } from "antd";
+import { Form, Layout, Select as AntdSelect, TreeSelect } from "antd";
 import { PlusIcon } from "../../../assets/icons";
 import FormModal from "../../../components/FormModal";
 import { useDispatch, useSelector } from "react-redux";
@@ -28,7 +28,7 @@ import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addEmployeeConfigurations,
 // addEmployeeConfigurations,
-deleteEmployeeConfigurations, editEmployeeConfigurations, employeeConfigurationsVisibility, getEmployeeConfigurations, getPositionsAll } from "../../../store/slices/questionnaire";
+deleteEmployeeConfigurations, editEmployeeConfigurations, employeeConfigurationsVisibility, getEmployeeConfigurations, getGeneralStructuresAll, getPositionsAll } from "../../../store/slices/questionnaire";
 import { getTransportEmployeesAll } from "../../../store/slices/employees";
 import Select from "../../../components/Select";
 var Option = AntdSelect.Option;
@@ -71,6 +71,9 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   var employeeConfigurations = useSelector(function (state) {
     return state.questionnaire.employeeConfigurations;
   });
+  var generalStructuresAll = useSelector(function (state) {
+    return state.questionnaire.generalStructuresAll;
+  });
   var transportEmployeesAll = useSelector(function (state) {
     return state.employees.transportEmployeesAll;
   });
@@ -80,7 +83,7 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   var paginationLength = setPaginationLength(employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.count, employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.size);
   var onSubmit = useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data_) {
-      var _data_$EmployeeIds, _data_$Positions, _data_$PersonInCharge, _data_$OperatingManag;
+      var _data_$EmployeeIds, _data_$Positions, _data_$PersonInCharge, _data_$GeneralStructu, _data_$OperatingManag;
       var data;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -89,7 +92,7 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
               EmployeeIds: ((_data_$EmployeeIds = data_.EmployeeIds) !== null && _data_$EmployeeIds !== void 0 ? _data_$EmployeeIds : []).join(","),
               Positions: ((_data_$Positions = data_.Positions) !== null && _data_$Positions !== void 0 ? _data_$Positions : []).join(","),
               PersonInChargeForFuelIds: ((_data_$PersonInCharge = data_.PersonInChargeForFuelIds) !== null && _data_$PersonInCharge !== void 0 ? _data_$PersonInCharge : []).join(","),
-              GeneralStructures: "21,26,202,255",
+              GeneralStructures: ((_data_$GeneralStructu = data_.GeneralStructures) !== null && _data_$GeneralStructu !== void 0 ? _data_$GeneralStructu : []).join(","),
               OperatingManagerIds: ((_data_$OperatingManag = data_.OperatingManagerIds) !== null && _data_$OperatingManag !== void 0 ? _data_$OperatingManag : []).join(",")
             });
             console.log(data);
@@ -105,10 +108,14 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     };
   }(), [dispatch, typeSelect]);
   var onEdit = useCallback(function (id, record) {
+    var _record$EmployeeIds, _record$Positions, _record$PersonInCharg, _record$GeneralStruct, _record$OperatingMana;
     var data = {
       id: id,
-      name: record === null || record === void 0 ? void 0 : record.name,
-      category: typeSelect
+      EmployeeIds: ((_record$EmployeeIds = record === null || record === void 0 ? void 0 : record.EmployeeIds) !== null && _record$EmployeeIds !== void 0 ? _record$EmployeeIds : []).join(","),
+      Positions: ((_record$Positions = record === null || record === void 0 ? void 0 : record.Positions) !== null && _record$Positions !== void 0 ? _record$Positions : []).join(","),
+      PersonInChargeForFuelIds: ((_record$PersonInCharg = record === null || record === void 0 ? void 0 : record.PersonInChargeForFuelIds) !== null && _record$PersonInCharg !== void 0 ? _record$PersonInCharg : []).join(","),
+      GeneralStructures: ((_record$GeneralStruct = record === null || record === void 0 ? void 0 : record.GeneralStructures) !== null && _record$GeneralStruct !== void 0 ? _record$GeneralStruct : []).join(","),
+      OperatingManagerIds: ((_record$OperatingMana = record === null || record === void 0 ? void 0 : record.OperatingManagerIds) !== null && _record$OperatingMana !== void 0 ? _record$OperatingMana : []).join(",")
     };
     dispatch(editEmployeeConfigurations(data));
   }, [dispatch, typeSelect]);
@@ -128,6 +135,7 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   };
   var onEditClick = useCallback(function (data) {
     var _ref$current2;
+    console.log(data);
     ref === null || ref === void 0 || (_ref$current2 = ref.current) === null || _ref$current2 === void 0 || _ref$current2.setEdit(data);
   }, []);
   var onDelete = useCallback(function (id) {
@@ -176,6 +184,34 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
           return person ? "".concat(person.name, " ").concat(person.surname, " ").concat(person.patronymic) : "";
         }).filter(Boolean).join(", ");
       };
+      var formatGeneralStructures = function formatGeneralStructures(ids) {
+        if (!Array.isArray(ids)) {
+          if (typeof ids === "string") {
+            ids = ids.split(",").map(function (id) {
+              return parseInt(id.trim(), 10);
+            });
+          } else {
+            return "";
+          }
+        }
+        var _flatten = function flatten(nodes) {
+          return nodes.reduce(function (acc, node) {
+            var _node$children;
+            acc.push(node);
+            if ((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length) {
+              acc = acc.concat(_flatten(node.children));
+            }
+            return acc;
+          }, []);
+        };
+        var flatList = _flatten(generalStructuresAll || []);
+        return ids.map(function (id) {
+          var node = flatList.find(function (n) {
+            return n.id === id;
+          });
+          return (node === null || node === void 0 ? void 0 : node.name) || "";
+        }).filter(Boolean).join(", ");
+      };
       var formatPositionNames = function formatPositionNames(ids) {
         if (!Array.isArray(ids)) {
           if (typeof ids === "string") {
@@ -187,27 +223,67 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
           }
         }
         return ids.map(function (id) {
-          var pos = positionsAll.find(function (p) {
+          var pos = positionsAll === null || positionsAll === void 0 ? void 0 : positionsAll.find(function (p) {
             return p.id === id;
           });
           return pos ? pos.name : "";
         }).filter(Boolean).join(", ");
       };
+      var toArray = function toArray(value) {
+        if (!value) return [];
+        if (Array.isArray(value)) return value;
+        if (typeof value === "string") {
+          return value.split(",").map(function (id) {
+            return parseInt(id.trim(), 10);
+          });
+        }
+        return [];
+      };
       return {
         num: (employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.size) * (employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.page) + i + 1 - (employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
-        EmployeeIds: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.employeeIds),
-        GeneralStructures: dataObj === null || dataObj === void 0 ? void 0 : dataObj.generalStructures,
-        OperatingManagerIds: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.operatingManagerIds),
-        PersonInChargeForFuelIds: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.personInChargeForFuelIds),
-        Positions: formatPositionNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.positions),
+        EmployeeIds1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.employeeIds),
+        GeneralStructures1: formatGeneralStructures(dataObj === null || dataObj === void 0 ? void 0 : dataObj.generalStructures),
+        OperatingManagerIds1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.operatingManagerIds),
+        PersonInChargeForFuelIds1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.personInChargeForFuelIds),
+        Positions1: formatPositionNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.positions),
+        EmployeeIds: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.employeeIds),
+        GeneralStructures: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.generalStructures),
+        OperatingManagerIds: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.operatingManagerIds),
+        PersonInChargeForFuelIds: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.personInChargeForFuelIds),
+        Positions: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.positions),
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };
     });
   }
+  var _convertToTreeData = function convertToTreeData(nodes) {
+    return nodes.map(function (node) {
+      var _node$children2;
+      return {
+        title: node.name,
+        value: node.id,
+        key: node.id,
+        children: (_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length ? _convertToTreeData(node.children) : undefined
+      };
+    });
+  };
+  var treeData = useMemo(function () {
+    if (!generalStructuresAll || !Array.isArray(generalStructuresAll)) return [];
+    var _convertToTreeData2 = function convertToTreeData(nodes) {
+      return nodes.map(function (node) {
+        return {
+          title: node.name,
+          value: node.id,
+          key: node.id,
+          children: node.children && node.children.length > 0 ? _convertToTreeData2(node.children) : undefined
+        };
+      });
+    };
+    return _convertToTreeData2(generalStructuresAll);
+  }, [generalStructuresAll]);
   var columns = useMemo(function () {
-    return getStreetColumns(onEditClick, onDelete, onStatusChange, transportEmployeesAll, dispatch);
+    return getStreetColumns(onEditClick, dispatch);
   }, [onEditClick, onDelete, onStatusChange, dispatch]);
   var _useState13 = useState(columns.map(function (col) {
       return col.dataIndex;
@@ -235,6 +311,7 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     dispatch(getPositionsAll({
       visibility: "nondeleted"
     }));
+    dispatch(getGeneralStructuresAll());
   }, [dispatch]);
   var updateSize = function updateSize(newSize) {
     setSize(newSize); // Update state
@@ -267,10 +344,10 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     className: style.content
   }, /*#__PURE__*/React.createElement("header", {
     className: style.header
-  }, /*#__PURE__*/React.createElement(Button, {
+  }, (employeeConfigurations === null || employeeConfigurations === void 0 ? void 0 : employeeConfigurations.count) === 0 ? /*#__PURE__*/React.createElement(Button, {
     onClick: onClickModal,
     color: "green"
-  }, " ", /*#__PURE__*/React.createElement(PlusIcon, null), " Soraq\xE7a \u0259lav\u0259 et"), /*#__PURE__*/React.createElement(Filter, {
+  }, /*#__PURE__*/React.createElement(PlusIcon, null), " Soraq\xE7a \u0259lav\u0259 et") : /*#__PURE__*/React.createElement("div", null), /*#__PURE__*/React.createElement(Filter, {
     columns: columns,
     selectedColumns: selectedColumns,
     setQuery: setQuery,
@@ -317,17 +394,19 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     centered: false
   }, /*#__PURE__*/React.createElement(Item, {
     rules: [{
-      required: true,
+      required: false,
       message: ""
     }],
     name: "EmployeeIds",
     label: "Heyyət üzvü"
   }, /*#__PURE__*/React.createElement(Select, {
-    mode: "multiple"
+    mode: "multiple",
+    labelInValue: true
   }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       key: item.id,
-      value: item.id
+      value: item.id,
+      label: "".concat(item.name, " ").concat(item.surname)
     }, "".concat(item.name, " ").concat(item.surname, " ").concat(item.patronymic, ", ").concat(item.generalStructureName, ", ").concat(item.positionName));
   }))), /*#__PURE__*/React.createElement(Item, {
     rules: [{
@@ -336,8 +415,17 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     }],
     name: "GeneralStructures",
     label: "Struktur vahidi"
-  }, /*#__PURE__*/React.createElement(Select, {
-    mode: "multiple"
+  }, /*#__PURE__*/React.createElement(TreeSelect, {
+    className: style.tree_select,
+    dropdownStyle: {
+      maxHeight: 400,
+      overflow: "auto"
+    },
+    placeholder: "",
+    allowClear: true,
+    multiple: true,
+    treeDefaultExpandAll: true,
+    treeData: treeData
   })), /*#__PURE__*/React.createElement(Item, {
     rules: [{
       required: false,
@@ -350,11 +438,12 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   }, positionsAll === null || positionsAll === void 0 ? void 0 : positionsAll.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       key: item.id,
-      value: item.id
+      value: item.id,
+      label: "".concat(item.name)
     }, "".concat(item.name));
   }))), /*#__PURE__*/React.createElement(Item, {
     rules: [{
-      required: true,
+      required: false,
       message: ""
     }],
     name: "PersonInChargeForFuelIds",
@@ -364,11 +453,12 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       key: item.id,
-      value: item.id
+      value: item.id,
+      label: "".concat(item.name, " ").concat(item.surname)
     }, "".concat(item.name, " ").concat(item.surname, " ").concat(item.patronymic, ", ").concat(item.generalStructureName, ", ").concat(item.positionName));
   }))), /*#__PURE__*/React.createElement(Item, {
     rules: [{
-      required: true,
+      required: false,
       message: ""
     }],
     name: "OperatingManagerIds",
@@ -378,7 +468,8 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
   }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       key: item.id,
-      value: item.id
+      value: item.id,
+      label: "".concat(item.name, " ").concat(item.surname)
     }, "".concat(item.name, " ").concat(item.surname, " ").concat(item.patronymic, ", ").concat(item.generalStructureName, ", ").concat(item.positionName));
   })))), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banch0u/core-project-test-repository",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "Shared core features for all projects",
   "main": "dist/index.js",
   "files": [