<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="113" column="0" selection-start-line="113" selection-start-column="0" selection-end-line="113" selection-end-column="0" />
+ <caret line="139" column="0" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
<folding />
</state>
</provider>
<file leaf-file-name="notules.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/1.0.0/routes/notules.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.49860725">
- <caret line="130" column="30" selection-start-line="130" selection-start-column="30" selection-end-line="130" selection-end-column="30" />
+ <state vertical-scroll-proportion="0.39693594">
+ <caret line="253" column="79" selection-start-line="253" selection-start-column="79" selection-end-line="253" selection-end-column="79" />
<folding />
</state>
</provider>
<file leaf-file-name="collectivities.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/1.0.0/routes/collectivities.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-5.322581">
- <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
+ <state vertical-scroll-proportion="-39.677418">
+ <caret line="82" column="0" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
<folding />
</state>
</provider>
<option value="$PROJECT_DIR$/1.0.0/routes/users.js" />
<option value="$PROJECT_DIR$/1.0.0/Models/Models.js" />
<option value="$PROJECT_DIR$/sql/create.sql" />
- <option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/1.0.0/routes/login.js" />
<option value="$PROJECT_DIR$/1.0.0/routes/collectivities.js" />
+ <option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/1.0.0/routes/notules.js" />
</list>
</option>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="66071000" />
+ <option name="totallyTimeSpent" value="80348000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="-904" width="1375" height="904" extended-state="6" />
- <editor active="false" />
+ <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="2" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/1.0.0/Models/Models.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="51" column="3" selection-start-line="51" selection-start-column="3" selection-end-line="51" selection-end-column="3" />
- <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="9.67742">
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/index.js">
+ <entry file="file://$PROJECT_DIR$/1.0.0/Models/Models.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="113" column="0" selection-start-line="113" selection-start-column="0" selection-end-line="113" selection-end-column="0" />
+ <caret line="51" column="3" selection-start-line="51" selection-start-column="3" selection-end-line="51" selection-end-column="3" />
<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="-5.322581">
- <caret line="11" column="83" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
+ <state vertical-scroll-proportion="-39.677418">
+ <caret line="82" column="0" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/index.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="139" column="0" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/1.0.0/routes/notules.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.49860725">
- <caret line="130" column="30" selection-start-line="130" selection-start-column="30" selection-end-line="130" selection-end-column="30" />
+ <state vertical-scroll-proportion="0.39693594">
+ <caret line="253" column="79" selection-start-line="253" selection-start-column="79" selection-end-line="253" selection-end-column="79" />
<folding />
</state>
</provider>
get my collectivity
*/
router.get('/', function(req, res){
- Models.Collectivity.where('id', req.token.collectivity_id).fetch({withRelated: ['collectivitySon.collectivitySon']})
+ Models.Collectivity.where('id', req.token.collectivity_id).fetch({withRelated: ['collectivitySon.collectivitySon','collectivityMother.collectivityMother']})
.then(function(coll){
console.log(coll.toJSON());
res.json({success: true, message:coll.toJSON()})
router.post('/linkToOne', function(req,res) {
console.log(req.body);
+ console.log(req.token.collectivity_id);
new Models.Collectivity_Collectivity({
'collectivity_motherid': req.token.collectivity_id,
- 'collectivity_sonid': req.body.sonId
+ 'collectivity_sonid': req.body.collectivity_sonid
})
.save()
.then(function (model) {
})
.catch(function(err){
console.log(err);
- res.json({success : false});
+ res.json({success : false, message: err});
});
});
console.log(req.body);
new Models.Collectivity_Collectivity({
'collectivity_motherid': req.token.collectivity_id,
- 'collectivity_sonid': req.body.sonId
+ 'collectivity_sonid': req.body.collectivity_sonid
}).where({'collectivity_motherid': req.token.collectivity_id,
- 'collectivity_sonid': req.body.sonId})
+ 'collectivity_sonid': req.body.collectivity_sonid})
.destroy()
.then(function (model) {
res.json({success : true});
-
-
-
-
router.get('/notules', function(req, res){
Models.Collectivity_Notule.where('collectivity_id',req.token.collectivity_id).fetchAll({withRelated: ['notule']})
/**
* notule fill by user
*/
-router.post('countSend', function(req, res){
+router.post('/countSend', function(req, res){
//req.body.notuleId
new Models.Notule('id', req.body.notuleId).fetch({column: ['countsend']})
.then(function(notule){
});
+router.get('/postalCode/:code', function(req, res){
-/**
- * get one notule and its email
- */
-router.get('/:notuleId/:collectivityId', function(req, res){
-
-console.log("get one notules");
-
- var linktable = {
- collectivity_id : req.params.notuleId,
- notule_id : req.params.collectivityId,
- }
+ console.log("toto");
- Models.Collectivity_Notule.where(linktable).fetch({withRelated: ['notule']})
- .then(function (notules){
- res.json({success : true, message: notules.toJSON()});
+ Models.Collectivity.where('code', req.params.code)
+ .fetch({
+ withRelated: ['collectivityMother'],
+ columns: ['id']
})
- .catch(function(err){
- res.json({success : false, message: err});
+ .then(function(collectivity){
+ var collIds = []
+ if(collectivity){
+ //res.json({success: true, message:collectivity.toJSON()})
+ var coll = collectivity.toJSON();
+ collIds.push(coll.id);
+ for(var i = 0; i < coll.collectivityMother.length; i++){
+ collIds.push(coll.collectivityMother[i].collectivity_motherid);
+ }
+ }
+ notulesList(res, collIds)
});
});
+
+
+
+
/**
* create a new notule
*/
var resize = function(file){
var gm = require('gm').subClass({imageMagick: true});
console.log(resize);
- gm(file)
+ gm(file)
.resize(160, 160, '!')
.write(file, function (err) {
console.log("error : " + err)
-
-router.get('/client/:lat/:lon', function(req, res){
-
- lat = req.params.lat;
- lon = req.params.lon;
-
- // client.get("http://nominatim.openstreetmap.org/reverse?format=json&lat=" + lat +"&lon=" + lon +"&email=theo.guillon@adullact-projet.coop", function (data, response) {
+router.get('/cp/:lat/:lon', function(req, res){
+ var lat = req.params.lat;
+ var lon = req.params.lon;
+ client.get("http://nominatim.openstreetmap.org/reverse?format=json&lat=" + lat +"&lon=" + lon +"&email=theo.guillon@adullact-projet.coop", function (data, response) {
// parsed response body as js object
//console.log(data);
//console.log(decoder.write(data));
- // res.json({city : data.address.city})
+
+
+ res.json({success: true, postcode: data.address.postcode});
+
+
+
//get all corresponding collecitvities
//res.json({content : data});
- /* if(!data.address.city){
- return res.send({success: false, message:"no city"});
- }*/
+ /* if(!data.address.city){
+ return res.send({success: false, message:"no city"});
+ }*/
+
+ });
+});
+
+
+
+
+router.get('/client/:lat/:lon', function(req, res){
+
+ var lat = req.params.lat;
+ var lon = req.params.lon;
+
+ client.get("http://nominatim.openstreetmap.org/reverse?format=json&lat=" + lat +"&lon=" + lon +"&email=theo.guillon@adullact-projet.coop", function (data, response) {
+ // parsed response body as js object
+ //console.log(data);
+ //console.log(decoder.write(data));
+ // res.json({city : data.address.city})
+
+ //get all corresponding collecitvities
+
+ //res.json({content : data});
+ if(!data.address){
+ return res.send({success: false, message:"no city"});
+ }
var city = removeDiacritics(data.address.city).toUpperCase()
- Models.Collectivity.where('name', /*data.address.city*/"CĂ©ret")
- .fetch({
- withRelated: ['collectivityMother'],
- columns: ['id']
- })
- .then(function(collectivity){
- var collIds = []
- if(collectivity){
- //res.json({success: true, message:collectivity.toJSON()})
- coll = collectivity.toJSON();
- collIds.push(coll.id);
- for(var i = 0; i < coll.collectivityMother.length; i++){
- collIds.push(coll.collectivityMother[i].collectivity_motherid);
- }
+ Models.Collectivity.where('name', city)
+ .fetch({
+ withRelated: ['collectivityMother'],
+ columns: ['id']
+ })
+ .then(function(collectivity){
+ var collIds = []
+ if(collectivity){
+ //res.json({success: true, message:collectivity.toJSON()})
+ coll = collectivity.toJSON();
+ collIds.push(coll.id);
+ for(var i = 0; i < coll.collectivityMother.length; i++){
+ collIds.push(coll.collectivityMother[i].collectivity_motherid);
}
+ }
+ //res.json({success: true, message: collIds});
+ notulesList(res, collIds)
+ })
- //res.json({success: true, message: collIds});
- notulesList(res, collIds)
- })
-
- //});
+ });
});
+
+
+
+
var notulesList = function(res,collIds){
Models.Collectivity_Notule.where('collectivity_id', 'in', collIds).fetchAll({columns: ['notule_id']})
.then(function(model) {
if (model) {
var coll = model.toJSON();
console.log(coll);
+
+ for(var i = 0; i < coll.length; i++){
+ //coll[i].collectivity = coll[i].collectivityNotule.collectivity;
+ console.log(coll[i]);
+ for(var j = 0; j < coll[i].collectivityNotule.length; j++){
+ coll[i].collectivityNotule[j].id = coll[i].collectivityNotule[j].collectivity.id;
+ coll[i].collectivityNotule[j].name = coll[i].collectivityNotule[j].collectivity.name;
+ coll[i].collectivityNotule[j].type = coll[i].collectivityNotule[j].collectivity.type;
+ coll[i].collectivityNotule[j].code = coll[i].collectivityNotule[j].collectivity.code;
+ coll[i].collectivityNotule[j].image = coll[i].collectivityNotule[j].collectivity.image;
+ delete(coll[i].collectivityNotule[j].collectivity);
+ }
+ coll[i].collectivity = coll[i].collectivityNotule;
+ delete(coll[i].collectivityNotule);
+ //coll[i].collectivity.email = coll[i].collectivityNotule.email;
+
+ }
+
res.json({info: "ok", success: true, message: coll});
} else {
res.json({success: true, message: "no.nodules"});
}
+
+
+/**
+ * get one notule and its email
+ */
+router.get('/:notuleId/:collectivityId', function(req, res){
+
+ console.log("get one notules");
+
+ var linktable = {
+ collectivity_id : req.params.notuleId,
+ notule_id : req.params.collectivityId,
+ }
+
+ Models.Collectivity_Notule.where(linktable).fetch({withRelated: ['notule']})
+ .then(function (notules){
+ res.json({success : true, message: notules.toJSON()});
+ })
+ .catch(function(err){
+ res.json({success : false, message: err});
+ });
+});
+
+
/*
Models.Collectivity.where('name', /*data.address.city*/ //"ville")
/* .fetch({