Merge branch 'master' into olym

modules/pm/controllers/pm_controller.js

@@ -1,8 +1,8 @@
 /**
  * Created by Mai on 2017/1/18.
  */
-let ProjectsData = require('../models/project').project;
-let projType = require('../models/project').projType;
+let ProjectsData = require('../models/project_model').project;
+let projType = require('../models/project_model').projType;
 
 //统一回调函数
 let callback = function(req, res, err, message, data){
@@ -36,8 +36,7 @@ module.exports = {
         });
     },
     getProjects: function(req, res){
-        let data = JSON.parse(req.body.data);
-        ProjectsData.getUserProjects(data.user_id, function(err, message, projects){
+        ProjectsData.getUserProjects(req.session.sessionUser.ssoId, function(err, message, projects){
             if (projects) {
                 callback(req, res, err, message, projects);
             } else {
@@ -47,7 +46,7 @@ module.exports = {
     },
     updateProjects: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.updateUserProjects(data.user_id, data.updateData, function (err, message, data) {
+        ProjectsData.updateUserProjects(req.session.sessionUser.ssoId, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {
@@ -57,7 +56,7 @@ module.exports = {
     },
     copyProjects: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.copyUserProjects(data.user_id, data.updateData, function (err, message, data) {
+        ProjectsData.copyUserProjects(req.session.sessionUser.ssoId, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {
@@ -67,13 +66,13 @@ module.exports = {
     },
     rename: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.rename(data.user_id, data.id, data.newName, function (err, message) {
+        ProjectsData.rename(req.session.sessionUser.ssoId, data.id, data.newName, function (err, message) {
             callback(req, res, err, message, null);
         });
     },
     getProject: function(req, res){
         let data = JSON.parse(req.body.data);
-        ProjectsData.getUserProject(data.user_id, data.proj_id, function(err, message, data){
+        ProjectsData.getUserProject(req.session.sessionUser.ssoId, data.proj_id, function(err, message, data){
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {
@@ -83,7 +82,7 @@ module.exports = {
     },
     beforeOpenProject: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.beforeOpenProject(data.user_id, data.proj_id, data.updateData, function (err, message, data) {
+        ProjectsData.beforeOpenProject(req.session.sessionUser.ssoId, data.proj_id, data.updateData, function (err, message, data) {
             callback(req, res, err, message, data);
         });
     },

modules/pm/models/project.js

@@ -6,25 +6,11 @@ let counter = require("../../../public/counter/counter.js");
 let newProjController = require('../controllers/new_proj_controller');
 let copyProjController = require('../controllers/copy_proj_controller');
 
-let mongoose = require("mongoose");
-
-let dbm = require("../../../config/db/db_manager");
-let db = dbm.getCfgConnection("usersManages");
-let Schema = mongoose.Schema;
-let deleteSchema = require('../../../public/models/delete_schema');
-let ProjectSchema = new Schema({
-    "ID": Number,
-    "ParentID": Number,
-    "NextSiblingID": Number,
-    "userID": Number,
-    "name": String,
-    "projType": String,
-    "recentDateTime": Date,
-    "createDateTime": Date,
-    "deleteInfo": deleteSchema,
-    'fullFolder': Array
-});
-let Projects = db.model("projects", ProjectSchema);
+let Projects = require("./project_schema");
+let projectType = {
+    folder: 'Folder',
+    tender: 'Tender'
+};
 
 let ProjectsDAO = function(){};
 
@@ -68,12 +54,12 @@ ProjectsDAO.prototype.updateUserProjects = function(userId, datas, callback){
                 Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll)
             } else if (data.updateType === 'new') {
                 data.updateData['userID'] = userId;
-                if (data.updateData.projType === 'Tender') {
+                if (data.updateData.projType === projectType.folder) {
                     data.updateData['createDateTime'] = new Date();
                 }
                 newProject = new Projects(data.updateData);
                 newProject.save(function (err, result) {
-                    if (!err && result._doc.projType === 'Tender') {
+                    if (!err && result._doc.projType === projectType.tender) {
                         newProjController.copyTemplateData(tempType, newProject.ID, updateAll);
                     } else {
                         updateAll(err);
@@ -181,8 +167,5 @@ ProjectsDAO.prototype.getProject = function (key, callback) {
 
 module.exports ={
     project: new ProjectsDAO(),
-    projType: {
-        folder: 'Folder',
-        tender: 'Tender'
-    }
+    projType: projectType
 };

modules/pm/models/project_schema.js

@@ -0,0 +1,26 @@
+/**
+ * Created by Mai on 2017/7/5.
+ */
+
+let mongoose = require("mongoose");
+let Schema = mongoose.Schema;
+let deleteSchema = require('../../../public/models/delete_schema');
+
+let collectionName = 'projects';
+let ProjectSchema = new Schema({
+    "ID": Number,
+    "ParentID": Number,
+    "NextSiblingID": Number,
+    "userID": Number,
+    "name": String,
+    "projType": String,
+    "recentDateTime": Date,
+    "createDateTime": Date,
+    "deleteInfo": deleteSchema,
+    'fullFolder': Array
+});
+
+module.exports = mongoose.model(collectionName, ProjectSchema)
+
+
+

web/building_saas/pm/js/pm_main.js

@@ -605,7 +605,7 @@ $('#copytoOk').click(function() {
             CommonAjax.post('/pm/api/getNewProjectID', {count: 1}, function (IDs) {
                 var updateData = GetCopyUpdateData(cur, parent, next, IDs.lowID);
                 Tree.maxNodeId(IDs.lowID - 1);
-                CommonAjax.post('/pm/api/copyProjects', {user_id: userID, updateData: updateData}, function (data) {
+                CommonAjax.post('/pm/api/copyProjects', {updateData: updateData}, function (data) {
                     form.modal('hide');
                     data.forEach(function (nodeData) {
                         if (nodeData.updateType === 'copy') {