code adjust(public/web & delete_schema)

modules/GLJ/models/GLJList.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/unitPriceFile_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;

modules/GLJ/models/unitPriceFile.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/unitPriceFile_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/GLJ.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var Schema = mongoose.Schema;
 var counter = require("../../../public/counter/counter.js");
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/bills.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var Schema = mongoose.Schema;
 var async = require("async");
 var counter = require("../../../public/counter/counter.js");

modules/main/models/projectGLJ.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/projectProperties.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/ration.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;

modules/pm/models/project.js

@@ -11,7 +11,7 @@ var mongoose = require("mongoose");
 var dbm = require("../../../config/db/db_manager");
 var db = dbm.getCfgConnection("usersManages");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var ProjectSchema = new Schema({
     "ID": Number,
     "ParentID": Number,

modules/templates/models/bills_template.js

@@ -8,7 +8,7 @@ var mongoose = require('mongoose');
 var dbm = require("../../../config/db/db_manager");
 var templatesDB = dbm.getCfgConnection("templates");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var BillsTemplateSchema = new Schema({
     ID: Number,
     ParentID: Number,

test/unit/idTree/idTreeTest.js

@@ -30,7 +30,7 @@ var getKeyIDs = function (node) {
 }
 
 test('loading idTree Module: ', function (t) {
-    var idTreeCode = fs.readFileSync(__dirname + '../../../../public/web/idTree.js', 'utf8', 'r');
+    var idTreeCode = fs.readFileSync(__dirname + '../../../../public/web/id_tree.js', 'utf8', 'r');
     eval(idTreeCode);
     idTreeUtil = idTree;
     t.pass('pass for loading idTree Module');

web/building_saas/main/html/main.html

@@ -487,13 +487,13 @@
     <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
     <!-- Model -->
-    <script type="text/javascript" src="/web/building_saas/main/js/models/mainConsts.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/project.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/bills.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/ration.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/glj.js"></script>
 
-    <script type="text/javascript" src="/public/web/idTree.js"></script>
+    <script type="text/javascript" src="/public/web/id_tree.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/cache_tree.js"></script>
     <script type="text/javascript" src="/test/tmp_data/data_15690.js"></script>
     <!-- Controller -->
@@ -507,7 +507,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_ration_lib.js"></script>
-    <script type="text/javascript" src="/public/web/urlUtil.js"></script>
+    <script type="text/javascript" src="/public/web/url_util.js"></script>
     <SCRIPT type="text/javascript">
   		<!--
   		var setting = {

web/building_saas/pm/html/project-management.html

@@ -455,7 +455,7 @@
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
-    <script src="/public/web/dateUtil.js"></script>
+    <script src="/public/web/date_util.js"></script>
     <script src="/public/web/tree_table/tree_table.js"></script>
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <script src="/web/building_saas/pm/js/pm_ajax.js"></script>

web/maintain/billsLib/html/qingdan.html

@@ -218,7 +218,7 @@
     <script src="/web/maintain/billsLib/scripts/setSheets.js"></script>
     <script src="/web/maintain/billsLib/scripts/billsLibAjax.js"></script>
     <!--idTree-->
-    <script src="/public/web/idTree.js"></script>
+    <script src="/public/web/id_tree.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
     <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
     <script src="/web/maintain/billsLib/scripts/billsLibSetting.js"></script>

web/maintain/ration_repository/main.html

@@ -130,7 +130,7 @@
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/maintain/ration_repository/js/global.js"></script>
     <!-- zTree -->
-    <script type="text/javascript" src="/public/web/dateUtil.js"></script>
+    <script type="text/javascript" src="/public/web/date_util.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
     <script type="text/javascript" src="/web/maintain/ration_repository/js/mainJ.js"></script>

web/maintain/templates/html/bills.html

@@ -92,7 +92,7 @@
 <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
 <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
 <!-- Models -->
-<script type="text/javascript" src="/public/web/idTree.js"></script>
+<script type="text/javascript" src="/public/web/id_tree.js"></script>
 <!-- Controller -->
 <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
 <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>

web/users/login.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <script src="/lib/jquery/jquery.min.js"></script>
-    <script src="/public/web/urlUtil.js"></script>
+    <script src="/public/web/url_util.js"></script>
 </head>
 <body>
     <div class="container">