<project version="4">
<component name="ChangeListManager">
<list default="true" id="c3f46dee-5c56-40ca-ada1-ba3d292b258d" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.0.0/routes/collectivities.js" afterPath="$PROJECT_DIR$/1.0.0/routes/collectivities.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.0.0/routes/login.js" afterPath="$PROJECT_DIR$/1.0.0/routes/login.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.0.0/routes/notules.js" afterPath="$PROJECT_DIR$/1.0.0/routes/notules.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.0.0/routes/users.js" afterPath="$PROJECT_DIR$/1.0.0/routes/users.js" />
</list>
<ignored path="amiesserver.iws" />
<ignored path=".idea/workspace.xml" />
<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="60" column="10" selection-start-line="60" selection-start-column="10" selection-end-line="60" selection-end-column="10" />
+ <caret line="166" column="0" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
<folding />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/login.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="80" column="15" selection-start-line="63" selection-start-column="12" selection-end-line="80" selection-end-column="15" />
+ <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
<folding />
</state>
</provider>
<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="73" column="54" selection-start-line="73" selection-start-column="54" selection-end-line="73" selection-end-column="54" />
+ <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/collectivities.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9599466">
- <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" />
+ <caret line="114" column="1" selection-start-line="114" selection-start-column="1" selection-end-line="114" selection-end-column="1" />
<folding />
</state>
</provider>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/1.0.0/routes/login.js" />
<option value="$PROJECT_DIR$/sql/create.sql" />
<option value="$PROJECT_DIR$/index.js" />
- <option value="$PROJECT_DIR$/1.0.0/routes/users.js" />
<option value="$PROJECT_DIR$/1.0.0/Models/Models.js" />
+ <option value="$PROJECT_DIR$/1.0.0/routes/users.js" />
+ <option value="$PROJECT_DIR$/1.0.0/routes/login.js" />
<option value="$PROJECT_DIR$/1.0.0/routes/notules.js" />
<option value="$PROJECT_DIR$/1.0.0/routes/collectivities.js" />
</list>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="65" />
- <option name="y" value="-904" />
+ <option name="y" value="-4" />
<option name="width" value="1375" />
<option name="height" value="904" />
</component>
<created>1465557633813</created>
<option name="number" value="Default" />
<updated>1465557633813</updated>
- <workItem from="1465557634994" duration="28410000" />
+ <workItem from="1465557634994" duration="32509000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="28410000" />
+ <option name="totallyTimeSpent" value="32509000" />
</component>
<component name="ToolWindowManager">
- <frame x="65" y="-904" width="1375" height="904" extended-state="6" />
+ <frame x="65" y="-4" width="1375" height="904" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/sql/create.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.0">
- <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/node_modules/knex/lib/query/compiler.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3463143">
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/sql/create.sql">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-2.0">
+ <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<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="73" column="54" selection-start-line="73" selection-start-column="54" selection-end-line="73" selection-end-column="54" />
+ <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/login.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="80" column="15" selection-start-line="63" selection-start-column="12" selection-end-line="80" selection-end-column="15" />
+ <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
<folding />
</state>
</provider>
<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="60" column="10" selection-start-line="60" selection-start-column="10" selection-end-line="60" selection-end-column="10" />
+ <caret line="166" column="0" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
<folding />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/collectivities.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9599466">
- <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" />
+ <caret line="114" column="1" selection-start-line="114" selection-start-column="1" selection-end-line="114" selection-end-column="1" />
<folding />
</state>
</provider>
});
-router.post('/linkToONe', function(req,res) {
+router.post('/linkToOne', function(req,res) {
console.log(req.body);
new Model.Collectivity_Collectivity({
- 'collectivity_motherid': req.body.motherId,
+ 'collectivity_motherid': req.token.collectivity_id,
'collectivity_sonid': req.body.sonId
})
.save()
res.json({success: false, message:"error : " + error});
});
+});
+
+
+
+router.get('/notules', function(req, res){
+ /* Models.Notule.where('name', 'in', ['un', 'deux']).fetchAll({withRelated: ['collectivityNotule.collectivity']})
+ //Models.notules.where("collectivity_id", req.token.collectivity_id).fetchAll({withRelated: ['collectivityNotule.collectivity']})
+ .then(function (users){
+ res.json({success: true, message:users.toJSON()})
+ })
+ .catch(function(err){
+ res.json({success: false, message:"error : " + err})
+ });
+ */
+ Models.Collectivity_Notule.where('collectivity_id',req.token.collectivity_id) ({withRelated: ['notule']})
+ .then(function (notules){
+ if(!notules){
+ res.json({success: true, message:"no notule"})
+ }
+ console.log(notules.toJSON());
+ console.log(notules.related('notules').toJSON());
+ res.json({success : true, message :notules.related('notules').toJSON()});
+ })
+ .catch(function(err){
+ res.json({succes : false, message : err});
+ });
+
});
+
module.exports = router;