From 905cd6f870692d6c21d79ce05e5656f9cd505d48 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:07:52 +0800 Subject: [PATCH 1/7] EmailMessages interface is modified --- .../fdd/emailmessage/emailmessageoption.controller.js | 7 ++++--- admin/app/services/fdd/emailmessageanalysis.service.js | 2 +- myems-api/app.py | 2 +- myems-api/core/emailmessage.py | 7 +++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 06195354..98d7bc87 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -30,11 +30,12 @@ app.controller('EmailMessageOptionController', function( }; $scope.execute = function() { - var datestart, dateend; + var startdatetime, dateend; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 10), + enddatetime: $scope.daterange.endDate.format().slice(0, 10) }; + console.log(query.startdatetime,query.enddatetime) $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js index be596a7a..3f81cb6e 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessageanalysis.service.js @@ -3,7 +3,7 @@ app.factory('EmailMessageAnalysisService', function($http) { return { getAnalysisResult: function(query, headers, callback) { - $http.get(getAPI()+"emailmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) + $http.get(getAPI()+"emailmessages", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/app.py b/myems-api/app.py index abadcf81..e54d4210 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -170,7 +170,7 @@ api.add_route('/distributionsystems/{id_}', api.add_route('/distributionsystems/{id_}/distributioncircuits', distributionsystem.DistributionSystemDistributionCircuitCollection()) -api.add_route('/emailmessages/from/{startdate}/to/{enddate}', +api.add_route('/emailmessages', emailmessage.EmailMessageCollection()) api.add_route('/emailmessages/{id_}', emailmessage.EmailMessageItem()) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index eab41ee5..73bd3cce 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -17,8 +17,11 @@ class EmailMessageCollection: resp.status = falcon.HTTP_200 @staticmethod - def on_get(req, resp, startdate, enddate): - access_control(req) + def on_get(req, resp): + # access_control(req) + print(req.params) + startdate = req.params.get('startdatetime') + enddate = req.params.get('enddatetime') try: start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') except Exception: From 45e9bd9e7e13b0dcc186cbbb3960532816eb418c Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:13:11 +0800 Subject: [PATCH 2/7] Modified the EmailMessages interface --- .../fdd/emailmessage/emailmessageoption.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 98d7bc87..71ccea0f 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -30,12 +30,12 @@ app.controller('EmailMessageOptionController', function( }; $scope.execute = function() { - var startdatetime, dateend; + var startdatetime, enddatetime; var query = { startdatetime: $scope.daterange.startDate.format().slice(0, 10), enddatetime: $scope.daterange.endDate.format().slice(0, 10) }; - console.log(query.startdatetime,query.enddatetime) + $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod From 3cc2c929ec30811285780017014da8f53c612859 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:28:20 +0800 Subject: [PATCH 3/7] Modified the EmailMessages interface --- myems-api/core/emailmessage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 73bd3cce..07e5830f 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -18,7 +18,7 @@ class EmailMessageCollection: @staticmethod def on_get(req, resp): - # access_control(req) + access_control(req) print(req.params) startdate = req.params.get('startdatetime') enddate = req.params.get('enddatetime') From 952e9dd2780d267c8866fdb937ff8c666ec12163 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 09:49:38 +0800 Subject: [PATCH 4/7] Modified the EmailMessages interface3 --- .../fdd/emailmessageanalysis.service.js | 2 +- myems-api/core/emailmessage.py | 48 +++++++++++-------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js index 3f81cb6e..be0a6ab9 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessageanalysis.service.js @@ -3,7 +3,7 @@ app.factory('EmailMessageAnalysisService', function($http) { return { getAnalysisResult: function(query, headers, callback) { - $http.get(getAPI()+"emailmessages", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers}) + $http.get(getAPI()+"emailmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 07e5830f..a34ab3d8 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -13,38 +13,46 @@ class EmailMessageCollection: pass @staticmethod - def on_options(req, resp, startdate, enddate): + def on_options(req, resp): resp.status = falcon.HTTP_200 @staticmethod def on_get(req, resp): access_control(req) print(req.params) - startdate = req.params.get('startdatetime') - enddate = req.params.get('enddatetime') - try: - start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') - except Exception: - raise falcon.HTTPError(falcon.HTTP_400, - title='API.BAD_REQUEST', - description='API.INVALID_START_DATE_FORMAT') - try: - end_datetime_local = datetime.strptime(enddate, '%Y-%m-%d') - except Exception: - raise falcon.HTTPError(falcon.HTTP_400, - title='API.BAD_REQUEST', - description='API.INVALID_END_DATE_FORMAT') + start_datetime_local = req.params.get('startdatetime') + end_datetime_local = req.params.get('enddatetime') timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) if config.utc_offset[0] == '-': timezone_offset = -timezone_offset - start_datetime_utc = start_datetime_local.replace(tzinfo=timezone.utc) - start_datetime_utc -= timedelta(minutes=timezone_offset) + if start_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_START_DATE_FORMAT") + else: + start_datetime_local = str.strip(start_datetime_local) + try: + start_datetime_utc = datetime.strptime(start_datetime_local, + '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_START_DATE_FORMAT") - end_datetime_utc = end_datetime_local.replace(tzinfo=timezone.utc) - end_datetime_utc -= timedelta(minutes=timezone_offset) - end_datetime_utc += timedelta(days=1) + if end_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_END_DATE_FORMAT") + else: + end_datetime_local = str.strip(end_datetime_local) + try: + end_datetime_utc = datetime.strptime(end_datetime_local, + '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + end_datetime_utc += timedelta(days=1) + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_END_DATE_FORMAT") if start_datetime_utc >= end_datetime_utc: raise falcon.HTTPError(falcon.HTTP_400, From a581caa2fa833ea8c914bbfa57d70669d87eaf8a Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 09:52:55 +0800 Subject: [PATCH 5/7] Modified the EmailMessages interface4 --- myems-api/core/emailmessage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index a34ab3d8..4b5b0ed3 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -29,7 +29,7 @@ class EmailMessageCollection: if start_datetime_local is None: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_START_DATE_FORMAT") + description="API.INVALID_START_DATETIME_FORMAT") else: start_datetime_local = str.strip(start_datetime_local) try: @@ -38,11 +38,11 @@ class EmailMessageCollection: timedelta(minutes=timezone_offset) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_START_DATE_FORMAT") + description="API.INVALID_START_DATETIME_FORMAT") if end_datetime_local is None: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_END_DATE_FORMAT") + description="API.INVALID_END_DATETIME_FORMAT") else: end_datetime_local = str.strip(end_datetime_local) try: @@ -52,7 +52,7 @@ class EmailMessageCollection: end_datetime_utc += timedelta(days=1) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_END_DATE_FORMAT") + description="API.INVALID_END_DATETIME_FORMAT") if start_datetime_utc >= end_datetime_utc: raise falcon.HTTPError(falcon.HTTP_400, From 9086a2c7676bbf4b98fdf73ed5cfbc4e4d28a6c4 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 15:13:52 +0800 Subject: [PATCH 6/7] Modified the EmailMessages interface 5 --- .../fdd/emailmessage/emailmessageoption.controller.js | 10 +++++----- myems-api/core/emailmessage.py | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 71ccea0f..970be75a 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -11,14 +11,14 @@ app.controller('EmailMessageOptionController', function( endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, @@ -32,10 +32,10 @@ app.controller('EmailMessageOptionController', function( $scope.execute = function() { var startdatetime, enddatetime; var query = { - startdatetime: $scope.daterange.startDate.format().slice(0, 10), - enddatetime: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; - + $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 4b5b0ed3..050dbfbb 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -34,7 +34,7 @@ class EmailMessageCollection: start_datetime_local = str.strip(start_datetime_local) try: start_datetime_utc = datetime.strptime(start_datetime_local, - '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \ timedelta(minutes=timezone_offset) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -47,9 +47,8 @@ class EmailMessageCollection: end_datetime_local = str.strip(end_datetime_local) try: end_datetime_utc = datetime.strptime(end_datetime_local, - '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \ timedelta(minutes=timezone_offset) - end_datetime_utc += timedelta(days=1) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description="API.INVALID_END_DATETIME_FORMAT") From 6e4fd346519fc69beb9597824990286da31f8af1 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 17 Dec 2021 22:34:24 +0800 Subject: [PATCH 7/7] updated date-range-picker of emailmessage view in admin --- admin/views/fdd/emailmessage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html index d1ce6262..a052bfb0 100644 --- a/admin/views/fdd/emailmessage.html +++ b/admin/views/fdd/emailmessage.html @@ -4,8 +4,8 @@
-