Selaa lähdekoodia

таймзоны файлов

kpmy 7 vuotta sitten
vanhempi
commit
6dfeb92845
4 muutettua tiedostoa jossa 7 lisäystä ja 3 poistoa
  1. 1 0
      package.json
  2. 2 2
      src/crawler.js
  3. 3 0
      src/frontend.js
  4. 1 1
      src/index.html

+ 1 - 0
package.json

@@ -22,6 +22,7 @@
     "cheerio": "^1.0.0-rc.2",
     "electron-ipc-broadcast": "^0.1.0",
     "moment": "^2.20.1",
+    "moment-timezone": "^0.5.14",
     "openurl": "^1.1.1",
     "request": "^2.34",
     "request-promise-native": "^1.0.5",

+ 2 - 2
src/crawler.js

@@ -73,7 +73,7 @@ function doCrawl(cat, force) {
 
         var lastDates = settings().get('crawl').lastDates;
         if (_.isUndefined(lastDates)) lastDates = {};
-        var lastDate = _.has(lastDates, cat) ? lastDates[cat] : '2018-02-18';
+        var lastDate = _.has(lastDates, cat) ? lastDates[cat] : '2018-01-01';
 
         let date = moment(lastDate, 'YYYY-MM-DD').endOf('day');
         if (date.isBefore(moment())) date.add(1, 'day');
@@ -94,7 +94,7 @@ function doCrawl(cat, force) {
                     }
                 }).then(function ($) {
                     extractRows(r => {
-                        r.date = parseInt(date.format('x'));
+                        r.date = parseInt(date.clone().startOf('day').format('x'));
                         r.category = cat;
                         ret.push(r)
                     })($);

+ 3 - 0
src/frontend.js

@@ -2,6 +2,8 @@ const _ = global._ = require('underscore');
 const S = require('underscore.string');
 const fs = require('fs');
 const path = require('path');
+const moment = require('moment');
+const moment_tz = require('moment-timezone');
 
 require('angular').module('Ks', [require('angular-ui-router'), require('angular-messages'), require('angular-sanitize'), require('angular-material'), require('angular-material-data-table'), 'ngMdBadge', 'angularMoment']);
 
@@ -30,6 +32,7 @@ require('angular').module('Ks').config(function ($mdAriaProvider) {
         .backgroundPalette('grey');
 }).run(function (amMoment) {
     amMoment.changeLocale('ru');
+    amMoment.changeTimezone("Europe/Moscow")
 });
 require('./route.js');
 require('./root.js');

+ 1 - 1
src/index.html

@@ -12,7 +12,7 @@
     require('../node_modules/angular-i18n/angular-locale_ru-ru.js');
     require('../node_modules/angular-material-badge/angular-material-badge.min.js');
     require('../node_modules/angular-moment/angular-moment');
-    require('../node_modules/moment/locale/ru.js')
+    require('../node_modules/moment/locale/ru.js');
 </script>
 </body>
 </html>