Просмотр исходного кода

Merge pull request #4 from brettz9/html-get

Html get
dragfyre 6 лет назад
Родитель
Сommit
02428ea0e7
2 измененных файлов с 31 добавлено и 2 удалено
  1. 28 2
      api/controllers/bDateController.js
  2. 3 0
      api/routes/bDateRoutes.js

+ 28 - 2
api/controllers/bDateController.js

@@ -9,16 +9,42 @@ function sanitize_input(s) {
 exports.test = function(req, res) {
   res.json({ message: 'Hi there' });
 };
-exports.today = function(req, res) {
+
+function getTodayJSON () {
   var now = new Date();
   var here = new Object();
   here['latitude'] = '40.712'; // New York
   here['longitude'] = '-74.006';
 
   var now_badi = BadiCal.BadiDate.fromGregorianDate(now, here);
-  res.json({ message: "Today is " + now_badi.toString(),badi_date:{year:now_badi.getYear(),month:now_badi.getMonth(),day:now_badi.getDay(),month_name:now_badi.getMonthName()},greg_date:{year:now.getFullYear(),month:now.getMonth()+1,day:now.getDay(),hour:now.getHours(),minute:now.getMinutes(),second:now.getSeconds()}});
   console.log("Today: " + now_badi.toString());
+  return {
+    message: "Today is " + now_badi.toString(),
+    badi_date:{
+      year:now_badi.getYear(),
+      month:now_badi.getMonth(),
+      day:now_badi.getDay(),
+      month_name:now_badi.getMonthName()
+    },
+    greg_date:{
+      year:now.getFullYear(),
+      month:now.getMonth()+1,
+      day:now.getDay(),
+      hour:now.getHours(),
+      minute:now.getMinutes(),
+      second:now.getSeconds()
+    }
+  };
+}
+
+exports.today = function(req, res) {
+  res.json(getTodayJSON());
+};
+
+exports.todayHtml = function(req, res) {
+  res.end(JSON.stringify(getTodayJSON(), null, 2));
 };
+
 exports.date = function(req, res) {
   var year = sanitize_input(req.query['year']);
   var month = sanitize_input(req.query['month'])-1;

+ 3 - 0
api/routes/bDateRoutes.js

@@ -11,4 +11,7 @@ module.exports = function(app) {
   // Arbitrary Badi date
   app.route('/date')
     .get(bDate.date);
+
+  app.route('/today')
+    .get(bDate.todayHtml);
 };