migrations/20210325163147-addNewColumn.js

@@ -1,21 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.addColumn('Users', 'healthCenter', {
-        type: Sequelize.STRING,
-        allowNull: true,
-      }),
-      queryInterface.addColumn('Users', 'healthCenterCity', {
-        type: Sequelize.STRING,
-        allowNull: true,
-      }),
-    ]);
-  },
-
-  down: (queryInterface) => {
-    return Promise.all([queryInterface.removeColumn('Users', 'healthCenter'),
-    queryInterface.removeColumn('Users', 'healthCenterCity')]);
-  },
-};

migrations/20210325170616-changeCodeMelliType.js

@@ -1,15 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.changeColumn('Users', 'codeMelli', {
-        type: Sequelize.STRING,
-      }),
-    ]);
-  },
-
-  down: (queryInterface) => {
-    return Promise.all([queryInterface.changeColumn('Users', 'codeMelli')]);
-  },
-};

models/user.js

@@ -17,7 +17,7 @@ module.exports = (sequelize, DataTypes) => {
     firstName: DataTypes.STRING,
     lastName: DataTypes.STRING,
     fatherName: DataTypes.STRING,
-    codeMelli: DataTypes.STRING,
+    codeMelli: DataTypes.BIGINT,
     workUnit: DataTypes.STRING,
     workUnitCode: DataTypes.INTEGER,
     address: DataTypes.TEXT,
@@ -28,8 +28,6 @@ module.exports = (sequelize, DataTypes) => {
     writtenOrderNumber: DataTypes.INTEGER,
     writtenOrderDate: DataTypes.DATE,
     deadline: DataTypes.INTEGER,
-    healthCenter: DataTypes.STRING,
-    healthCenterCity: DataTypes.STRING,
     deadlineUnit: {
       type: DataTypes.STRING,
       defaultValue: 'روز'  

package.json

@@ -14,7 +14,6 @@
     "http-errors": "~1.6.3",
     "jalali-moment": "^3.3.10",
     "morgan": "~1.9.1",
-    "persianjs": "^0.4.0",
     "pg": "^8.5.1",
     "pizzip": "^3.0.6",
     "sequelize": "^6.5.0"

routes/users.js

@@ -6,68 +6,46 @@ var path = require('path');
 
 
 router.post('/add', function (req, res) {
-  let flag = false;
-  let emptyFieldsArray =[]
   const userInfo = {
-    firstName: req.body.firstName.trim(),
+    firstName: req.body.firstName,
-    lastName: req.body.lastName.trim(),
+    lastName: req.body.lastName,
-    fatherName: req.body.fatherName.trim(),
+    fatherName: req.body.fatherName,
-    codeMelli: req.body.codeMelli.trim(),
+    codeMelli: req.body.codeMelli,
-    workUnit: req.body.workUnit.trim(),
+    workUnit: req.body.workUnit,
-    workUnitCode: req.body.workUnitCode.trim(),
+    workUnitCode: req.body.workUnitCode,
-    address: req.body.address.trim(),
+    address: req.body.address,
-    obligationNumber: req.body.obligationNumber.trim(),
+    obligationNumber: req.body.obligationNumber,
-    obligationDate: req.body.obligationDate.trim(),
+    obligationDate: req.body.obligationDate,
-    requestNumber: req.body.requestNumber.trim(),
+    requestNumber: req.body.requestNumber,
-    requestDate: req.body.requestDate.trim(),
+    requestDate: req.body.requestDate,
-    writtenOrderNumber: req.body.writtenOrderNumber.trim(),
+    writtenOrderNumber: req.body.writtenOrderNumber,
-    writtenOrderDate: req.body.writtenOrderDate.trim(),
+    writtenOrderDate: req.body.writtenOrderDate,
-    deadline: req.body.deadline.trim(),
+    deadline: req.body.deadline
-    deadlineUnit: req.body.deadlineUnit.trim(),
-    healthCenter: req.body.healthCenter.trim(),
-    healthCenterCity: req.body.healthCenterCity.trim()
   }
-  for (const key in userInfo) {
+  userServeice.addUser(userInfo)
-    if (!userInfo[key] || !userInfo[key].trim()) {
+    .then((result) => {
-      emptyFieldsArray.push(key)
+      res.status(200).send({
-      flag = true
+        success: true,
-     
+        user: result
-    }
-  }
-
-  if(flag){
-    res.status(406).send({
-      success: false,
-      emptyFields : emptyFieldsArray,
-      error: `پر کردن همه فیلدها الزامی است`
-    })
-  }else {
-    userServeice.addUser(userInfo)
-      .then((result) => {
-        res.status(200).send({
-          success: true,
-          user: result
-        })
       })
-      .catch(err => {
+    })
-        if (err.eText) {
+    .catch(err => {
-          if (typeof err.eText !== 'string') {
+      if (err.eText) {
-            err.eText = err.eText.toString()
+        if (typeof err.eText !== 'string') {
-          }
+          err.eText = err.eText.toString()
-          res.status(err.eCode).send({
-            success: false,
-            error: err.eText
-          })
-        } else {
-          res.status(500).send({
-            success: false,
-            error: err.toString()
-          })
         }
+        res.status(err.eCode).send({
+          success: false,
+          error: err.eText
+        })
+      } else {
+        res.status(500).send({
+          success: false,
+          error: err.toString()
+        })
+      }
 
-      })
+    })
-  }
-
 });
 
 router.post('/complete/form', function (req, res) {
@@ -79,7 +57,6 @@ router.post('/complete/form', function (req, res) {
       })
     })
     .catch(err => {
-      console.log(err);
       if (err.eText) {
         if (typeof err.eText !== 'string') {
           err.eText = err.eText.toString()

services/user.js

@@ -1,6 +1,5 @@
 const models = require('../models')
 const jalali = require("jalali-moment");
-const persianjs = require('persianjs')
 const docxTemp = require('../tools/docxtemp')
 
 
@@ -57,26 +56,11 @@ methods.completeForm =(userId)=>{
         .then(user=>{
 
             let userInfo = user
-            
             userInfo.fullName = user.firstName + ' ' + user.lastName
-            
+            userInfo.deadlineAndUnit = user.deadline + ' ' + user.deadlineUnit
-            userInfo.codeMelli = persianjs(user.codeMelli).englishNumber().toString();
+            userInfo.obligationDate = jalali( user.obligationDate, 'YYYY/MM/DD').locale('fa').format('YYYY/MM/DD')
-            userInfo.workUnitCode = persianJs(user.workUnitCode).englishNumber().toString();
+            userInfo.requestDate = jalali( user.requestDate, 'YYYY/MM/DD').locale('fa').format('YYYY/MM/DD')
-            userInfo.obligationNumber = persianJs(user.obligationNumber).englishNumber().toString();
+            userInfo.writtenOrderDate = jalali( user.writtenOrderDate, 'YYYY/MM/DD').locale('fa').format('YYYY/MM/DD')
-            userInfo.requestNumber = persianJs(user.requestNumber).englishNumber().toString();
-            userInfo.writtenOrderNumber = persianJs(user.writtenOrderNumber).englishNumber().toString();
-            userInfo.deadline = persianJs(user.deadline).englishNumber().toString();
-
-            userInfo.deadlineAndUnit = userInfo.deadline + ' ' + userInfo.deadlineUnit
-
-            userInfo.obligationDate = jalali( user.obligationDate, 'YYYY/MM/DD').locale('fa').format('DD/MM/YYYY')
-            userInfo.requestDate = jalali( user.requestDate, 'YYYY/MM/DD').locale('fa').format('DD/MM/YYYY')
-            userInfo.writtenOrderDate = jalali( user.writtenOrderDate, 'YYYY/MM/DD').locale('fa').format('DD/MM/YYYY')
-            userInfo.obligationDate = persianJs(user.obligationDate).englishNumber().toString();
-            userInfo.requestDate = persianJs(user.requestDate).englishNumber().toString();
-            userInfo.writtenOrderDate = persianJs(user.writtenOrderDate).englishNumber().toString();
-           
-            
 
             return docxTemp(userInfo, userInfo.fileName)
         }).then(link=>{

tools/docxtemp.js

@@ -30,16 +30,8 @@ function errorHandler(error) {
     throw error;
 }
 
-module.exports = function (templateInfo, fileName) {
+module.exports = function (userInfo, fileName) {
     return new Promise((resolve, reject) => {
-        for (const key in templateInfo) {
-            if (!templateInfo[key]) {
-             throw({
-                eCode: 406,
-                eText: 'empty  fields'
-             })
-            }
-          }
         let content = fs.readFileSync(path.resolve(__dirname, `../template/${fileName}`), 'binary');
         let zip = new PizZip(content);
         let doc;
@@ -47,11 +39,10 @@ module.exports = function (templateInfo, fileName) {
         try {
             doc = new Docxtemplater(zip);
         } catch (error) {
-            
             errorHandler(error);
         }
 
-        doc.setData(templateInfo);
+        doc.setData(userInfo);
 
         try {
             doc.render()
@@ -62,8 +53,8 @@ module.exports = function (templateInfo, fileName) {
         let buf = doc.getZip().generate({
             type: 'nodebuffer'
         });
-        fs.writeFileSync(path.resolve(__dirname, `../public/files/${templateInfo.firstName}-${templateInfo.lastName}-${fileName}`), buf);
+        fs.writeFileSync(path.resolve(__dirname, `../public/files/${userInfo.firstName}-${userInfo.lastName}-${fileName}`), buf);
-        resolve(`http://localhost:3000/users/download/${templateInfo.firstName}-${templateInfo.lastName}-${fileName}`)
+        resolve(`http://localhost:3000/users/download/${userInfo.firstName}-${userInfo.lastName}-${fileName}`)
 
             .catch(err => {
                 reject({