<file leaf-file-name="notules.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/1.0.0/routes/notules.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+ <state vertical-scroll-proportion="-7.709677">
+ <caret line="125" column="54" selection-start-line="125" selection-start-column="42" selection-end-line="125" selection-end-column="54" />
<folding />
</state>
</provider>
<file leaf-file-name="collectivities.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/1.0.0/routes/collectivities.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5193592">
- <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
+ <state vertical-scroll-proportion="0.53938586">
+ <caret line="121" column="62" selection-start-line="121" selection-start-column="62" selection-end-line="121" selection-end-column="62" />
<folding />
</state>
</provider>
<created>1465557633813</created>
<option name="number" value="Default" />
<updated>1465557633813</updated>
- <workItem from="1465557634994" duration="38185000" />
+ <workItem from="1465557634994" duration="38527000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="38185000" />
+ <option name="totallyTimeSpent" value="38527000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="-904" width="1375" height="904" extended-state="6" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/1.0.0/routes/notules.js">
+ <entry file="file://$PROJECT_DIR$/1.0.0/routes/users.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+ <caret line="74" column="10" selection-start-line="67" selection-start-column="3" selection-end-line="74" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/1.0.0/routes/users.js">
+ <entry file="file://$PROJECT_DIR$/1.0.0/routes/notules.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="74" column="10" selection-start-line="67" selection-start-column="3" selection-end-line="74" selection-end-column="10" />
+ <state vertical-scroll-proportion="-7.709677">
+ <caret line="125" column="54" selection-start-line="125" selection-start-column="42" selection-end-line="125" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/collectivities.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5193592">
- <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
+ <state vertical-scroll-proportion="0.53938586">
+ <caret line="121" column="62" selection-start-line="121" selection-start-column="62" selection-end-line="121" selection-end-column="62" />
<folding />
</state>
</provider>
var config = require("../../config.js");
var sha1 = require("sha1");
var bookshelf = require("../../utils/bookshelf");
-var Model = require("../Models/Models");
+var Models = require("../Models/Models");
router.get('/list', function(req, res){
- Model.Collectivity.fetchAll()
+ Models.Collectivity.fetchAll()
.then(function(coll){
res.json({success: true, message:coll})
})
router.get('/detail/:id', function(req, res){
- Model.Collectivity.where('id', req.params.id).fetch({withRelated: ['collectivitySon.collectivitySon']})
+ Models.Collectivity.where('id', req.params.id).fetch({withRelated: ['collectivitySon.collectivitySon']})
.then(function(coll){
res.json({success: true, message:coll})
})
router.post('/linkToOne', function(req,res) {
console.log(req.body);
- new Model.Collectivity_Collectivity({
+ new Models.Collectivity_Collectivity({
'collectivity_motherid': req.token.collectivity_id,
'collectivity_sonid': req.body.sonId
})
linkCollectivities.push({collectivity_motherid: motherCollId, collectivity_sonid: sonCollsId[i]});
}
- var collectionColl = Model.Collectivity_Collectivity.collection(linkCollectivities);
+ var collectionColl = Models.Collectivity_Collectivity.collection(linkCollectivities);
collectionColl.invokeThen('save', null)
.then(function(toto){
res.json({success : true});
router.get('/notules', function(req, res){
- Models.Collectivity_Notule.where('collectivity_id',req.token.collectivity_id) ({withRelated: ['notule']})
+ Models.Collectivity_Notule.where('collectivity_id',req.token.collectivity_id).fetchAll({withRelated: ['notule']})
.then(function (notules){
if(!notules){
res.json({success: true, message:"no notule"})