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

package/dist/hooks/useNotification.js

@@ -23,9 +23,7 @@ var useNotification = function useNotification() {
       skipNegotiation: true
     }).configureLogging(signalR.LogLevel.Information).build();
     connection.start().then(function () {
-      console.log("SignalR bağlantısı quruldu.");
       connection.on("receive", function (message) {
-        console.log("Yeni bildiriş:", message);
         store.dispatch(setNotificationsRender());
         infoMessageBottomRight(message);
       });
@@ -34,7 +32,6 @@ var useNotification = function useNotification() {
     });
     return function () {
       connection.stop();
-      console.log("SignalR bağlantısı bağlandı.");
     };
   }, []);
 };

package/dist/layout/Sidebar/index.js

@@ -72,7 +72,6 @@ var Sidebar = function Sidebar(_ref) {
     setCollapsed(sidebarState);
     dispatch(getCompanyInfo());
   }, [dispatch]);
-  console.log(companyInfo);
   useEffect(function () {
     var fetchLogo = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {

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

@@ -72,7 +72,6 @@ var QuestionnairesDocumentTypeContent = function QuestionnairesDocumentTypeConte
       value: item === null || item === void 0 ? void 0 : item.id
     };
   });
-  console.log(categoriesAll);
   var onSubmit = useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -90,7 +89,6 @@ var QuestionnairesDocumentTypeContent = function QuestionnairesDocumentTypeConte
     };
   }(), [dispatch]);
   var onEdit = useCallback(function (id, record) {
-    console.log(record);
     var data = {
       id: id,
       name: record === null || record === void 0 ? void 0 : record.name,

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

@@ -38,6 +38,24 @@ export var getStreetColumns = function getStreetColumns(onEditClick, innerW) {
     width: innerW,
     disabled: false,
     ellipsis: true
+  }, {
+    title: "Sürücülər",
+    dataIndex: "DriverPositions1",
+    width: innerW,
+    disabled: false,
+    ellipsis: true
+  }, {
+    title: "Mexaniklər",
+    dataIndex: "MechanicPositions1",
+    width: innerW,
+    disabled: false,
+    ellipsis: true
+  }, {
+    title: "Dispetçerlər",
+    dataIndex: "DispatcherPositions",
+    width: innerW,
+    disabled: false,
+    ellipsis: true
   }, {
     title: "",
     key: "actions",

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

@@ -83,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_$GeneralStructu, _data_$OperatingManag;
+      var _data_$EmployeeIds, _data_$Positions, _data_$PersonInCharge, _data_$GeneralStructu, _data_$OperatingManag, _data_$DriverPosition, _data_$MechanicPositi, _data_$DispatcherPosi;
       var data;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -93,7 +93,10 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
               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: ((_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(",")
+              OperatingManagerIds: ((_data_$OperatingManag = data_.OperatingManagerIds) !== null && _data_$OperatingManag !== void 0 ? _data_$OperatingManag : []).join(","),
+              DriverPositions: ((_data_$DriverPosition = data_.DriverPositions) !== null && _data_$DriverPosition !== void 0 ? _data_$DriverPosition : []).join(","),
+              MechanicPositions: ((_data_$MechanicPositi = data_.MechanicPositions) !== null && _data_$MechanicPositi !== void 0 ? _data_$MechanicPositi : []).join(","),
+              DispatcherPositions: ((_data_$DispatcherPosi = data_.DispatcherPositions) !== null && _data_$DispatcherPosi !== void 0 ? _data_$DispatcherPosi : []).join(",")
             });
             console.log(data);
             dispatch(addEmployeeConfigurations(data));
@@ -108,14 +111,17 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
     };
   }(), [dispatch, typeSelect]);
   var onEdit = useCallback(function (id, record) {
-    var _record$EmployeeIds, _record$Positions, _record$PersonInCharg, _record$GeneralStruct, _record$OperatingMana;
+    var _record$EmployeeIds, _record$Positions, _record$PersonInCharg, _record$GeneralStruct, _record$OperatingMana, _record$DriverPositio, _record$MechanicPosit, _record$DispatcherPos;
     var data = {
       id: id,
       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(",")
+      OperatingManagerIds: ((_record$OperatingMana = record === null || record === void 0 ? void 0 : record.OperatingManagerIds) !== null && _record$OperatingMana !== void 0 ? _record$OperatingMana : []).join(","),
+      DriverPositions: ((_record$DriverPositio = record === null || record === void 0 ? void 0 : record.DriverPositions) !== null && _record$DriverPositio !== void 0 ? _record$DriverPositio : []).join(","),
+      MechanicPositions: ((_record$MechanicPosit = record === null || record === void 0 ? void 0 : record.MechanicPositions) !== null && _record$MechanicPosit !== void 0 ? _record$MechanicPosit : []).join(","),
+      DispatcherPositions: ((_record$DispatcherPos = record === null || record === void 0 ? void 0 : record.DispatcherPositions) !== null && _record$DispatcherPos !== void 0 ? _record$DispatcherPos : []).join(",")
     };
     dispatch(editEmployeeConfigurations(data));
   }, [dispatch, typeSelect]);
@@ -247,11 +253,17 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
         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),
+        DriverPositions1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.driverPositions),
+        MechanicPositions1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.mechanicPositions),
+        DispatcherPositions1: formatNames(dataObj === null || dataObj === void 0 ? void 0 : dataObj.dispatcherPositions),
         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),
+        DriverPositions: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.driverPositions),
+        MechanicPositions: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.mechanicPositions),
+        DispatcherPositions: toArray(dataObj === null || dataObj === void 0 ? void 0 : dataObj.dispatcherPositions),
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };
@@ -471,6 +483,51 @@ var QuestionnairesEmployeeConfigurations = function QuestionnairesEmployeeConfig
       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: false,
+      message: ""
+    }],
+    name: "DriverPositions",
+    label: "Sürücülər"
+  }, /*#__PURE__*/React.createElement(Select, {
+    mode: "multiple"
+  }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: 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: false,
+      message: ""
+    }],
+    name: "MechanicPositions",
+    label: "Mexaniklər"
+  }, /*#__PURE__*/React.createElement(Select, {
+    mode: "multiple"
+  }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: 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: false,
+      message: ""
+    }],
+    name: "DispatcherPositions",
+    label: "Dispetçerlər"
+  }, /*#__PURE__*/React.createElement(Select, {
+    mode: "multiple"
+  }, transportEmployeesAll === null || transportEmployeesAll === void 0 ? void 0 : transportEmployeesAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: 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() {
       return dispatch(setDeleteModalVisible(false));

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

@@ -3,7 +3,7 @@ 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) {
+export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, onStatusChange, drivingcategoriesAll, dispatch, innerW) {
   return [{
     title: "№",
     dataIndex: "num",
@@ -16,6 +16,15 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     width: innerW,
     disabled: true,
     ellipsis: true
+  }, {
+    title: "Kateqoriya",
+    dataIndex: "category",
+    width: innerW,
+    disabled: false,
+    ellipsis: true,
+    type: "select",
+    selectData: drivingcategoriesAll,
+    queryName: "categoryIds"
   }, {
     title: "Status",
     key: "status",

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

@@ -26,7 +26,7 @@ import Button from "../../../components/Button";
 import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
-import { addModel, deleteModel, editModel, getBrandsAll, getModel, modelsVisibility } from "../../../store/slices/questionnaire";
+import { addModel, deleteModel, editModel, getBrandsAll, getDrivingcategoriesAll, getModel, modelsVisibility } from "../../../store/slices/questionnaire";
 import Select from "../../../components/Select";
 var Content = Layout.Content;
 var Item = Form.Item;
@@ -71,16 +71,26 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
   var brandsAll = useSelector(function (state) {
     return state.questionnaire.brandsAll;
   });
+  var drivingcategoriesAll = useSelector(function (state) {
+    return state.questionnaire.drivingcategoriesAll;
+  });
+  console.log(drivingcategoriesAll);
   var paginationLength = setPaginationLength(model === null || model === void 0 ? void 0 : model.count, model === null || model === void 0 ? void 0 : model.size);
   var onSubmit = useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
+      var category, categoryName;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            category = drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.find(function (item) {
+              return item.id === data.categoryId;
+            });
+            categoryName = (category === null || category === void 0 ? void 0 : category.name) || "";
             dispatch(addModel(_objectSpread(_objectSpread({}, data), {}, {
-              brandId: brandSelect
+              brandId: brandSelect,
+              categoryName: categoryName
             })));
-          case 1:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -89,14 +99,21 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [dispatch, brandSelect]);
+  }(), [dispatch, brandSelect, drivingcategoriesAll]);
   var onEdit = useCallback(function (id, record) {
     var data = {
       id: id,
       name: record === null || record === void 0 ? void 0 : record.name,
-      brandId: brandSelect
+      brandId: brandSelect,
+      categoryId: record === null || record === void 0 ? void 0 : record.categoryId
     };
-    dispatch(editModel(data));
+    var category = drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.find(function (item) {
+      return item.id === data.categoryId;
+    });
+    var categoryName = (category === null || category === void 0 ? void 0 : category.name) || "";
+    dispatch(editModel(_objectSpread(_objectSpread({}, data), {}, {
+      categoryName: categoryName
+    })));
   }, [dispatch, brandSelect]);
   var onStatusChange = useCallback(function (data, checked) {
     var data_ = {
@@ -134,18 +151,21 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
   if (model !== null && model !== void 0 && model.items) {
     var _model$items;
     data = model === null || model === void 0 || (_model$items = model.items) === null || _model$items === void 0 ? void 0 : _model$items.map(function (dataObj, i) {
+      var _dataObj$category, _dataObj$category2;
       return {
         num: (model === null || model === void 0 ? void 0 : model.size) * (model === null || model === void 0 ? void 0 : model.page) + i + 1 - (model === null || model === void 0 ? void 0 : model.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
+        category: dataObj === null || dataObj === void 0 || (_dataObj$category = dataObj.category) === null || _dataObj$category === void 0 ? void 0 : _dataObj$category.text,
+        categoryId: dataObj === null || dataObj === void 0 || (_dataObj$category2 = dataObj.category) === null || _dataObj$category2 === void 0 ? void 0 : _dataObj$category2.id,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };
     });
   }
   var columns = useMemo(function () {
-    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch);
-  }, [onEditClick, onDelete, onStatusChange, dispatch]);
+    return getStreetColumns(onEditClick, onDelete, onStatusChange, drivingcategoriesAll, dispatch);
+  }, [onEditClick, onDelete, onStatusChange, drivingcategoriesAll, dispatch]);
   var _useState13 = useState(columns.map(function (col) {
       return col.dataIndex;
     })),
@@ -162,6 +182,7 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     dispatch(getBrandsAll({
       visibility: "nondeleted"
     }));
+    dispatch(getDrivingcategoriesAll("nondeleted"));
   }, [dispatch]);
   useEffect(function () {
     if (window.innerWidth >= 1900) {
@@ -266,7 +287,19 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     label: "Ad"
   }, /*#__PURE__*/React.createElement(Input, {
     className: style.modal_input
-  }))), /*#__PURE__*/React.createElement(DeleteModal, {
+  })), /*#__PURE__*/React.createElement(Item, {
+    rules: [{
+      required: true,
+      message: ""
+    }],
+    name: "categoryId",
+    label: "Kateqoriya"
+  }, /*#__PURE__*/React.createElement(Select, null, drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: item.id,
+      value: item.id
+    }, item.name);
+  })))), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
     },

package/dist/store/slices/questionnaire/index.js

@@ -10468,7 +10468,7 @@ export var getEmployeeConfigurationsAll = createAsyncThunk("/getEmployeeConfigur
           _context320.prev = 1;
           dispatch(setLoading(true));
           _context320.next = 5;
-          return Services.getEmployeeConfigurationsAll(visibility);
+          return Services.getEmployeeConfigurationsAll(visibility === null || visibility === void 0 ? void 0 : visibility.visibility);
         case 5:
           response = _context320.sent;
           dispatch(setLoading(false));
@@ -11051,6 +11051,10 @@ export var questionnaire = createSlice({
       var payload = _ref754.payload;
       state.ordersAll = payload;
     });
+    builder.addCase(getDrivingcategoriesAll.fulfilled, function (state, _ref755) {
+      var payload = _ref755.payload;
+      state.drivingcategoriesAll = payload;
+    });
   }
 });
 var setPage = questionnaire.actions.setPage;

package/dist/store/slices/questionnaire/service.js

@@ -5516,16 +5516,15 @@ _defineProperty(Services, "addEmployeeConfigurations", /*#__PURE__*/function ()
     return _regeneratorRuntime.wrap(function _callee298$(_context298) {
       while (1) switch (_context298.prev = _context298.next) {
         case 0:
-          console.log(data);
-          _context298.next = 3;
+          _context298.next = 2;
           return api.post("/employeeconfigurations", data, {
             headers: {
               "Content-Type": "application/json"
             }
           });
-        case 3:
+        case 2:
           return _context298.abrupt("return", _context298.sent);
-        case 4:
+        case 3:
         case "end":
           return _context298.stop();
       }

package/package.json

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