seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified the EmailMessages interface 5

pull/96/head
tianlinzhong 2021-12-15 15:13:52 +08:00
parent a581caa2fa
commit 9086a2c767
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
View File

@ -11,14 +11,14 @@ app.controller('EmailMessageOptionController', function(
endDate: moment() endDate: moment()
}; };
$scope.dtOptions = { $scope.dtOptions = {
timePicker: false, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 1, timePickerIncrement: 1,
timePickerSeconds: true, timePickerSeconds: true,
startView:2, startView:2,
autoApply: true, autoApply: true,
locale:{ locale:{
format: 'YYYY-MM-DD', format: 'YYYY-MM-DDTHH:mm:ss',
applyLabel: "OK", applyLabel: "OK",
cancelLabel: "Cancel", cancelLabel: "Cancel",
}, },
@ -32,8 +32,8 @@ app.controller('EmailMessageOptionController', function(
$scope.execute = function() { $scope.execute = function() {
var startdatetime, enddatetime; var startdatetime, enddatetime;
var query = { var query = {
startdatetime: $scope.daterange.startDate.format().slice(0, 10), startdatetime: $scope.daterange.startDate.format().slice(0, 19),
enddatetime: $scope.daterange.endDate.format().slice(0, 10) enddatetime: $scope.daterange.endDate.format().slice(0, 19)
}; };
$scope.$emit('handleEmitEmailMessageOptionChanged', { $scope.$emit('handleEmitEmailMessageOptionChanged', {

5
myems-api/core/emailmessage.py
View File

@ -34,7 +34,7 @@ class EmailMessageCollection:
start_datetime_local = str.strip(start_datetime_local) start_datetime_local = str.strip(start_datetime_local)
try: try:
start_datetime_utc = datetime.strptime(start_datetime_local, 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) timedelta(minutes=timezone_offset)
except ValueError: except ValueError:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
@ -47,9 +47,8 @@ class EmailMessageCollection:
end_datetime_local = str.strip(end_datetime_local) end_datetime_local = str.strip(end_datetime_local)
try: try:
end_datetime_utc = datetime.strptime(end_datetime_local, 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) timedelta(minutes=timezone_offset)
end_datetime_utc += timedelta(days=1)
except ValueError: except ValueError:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description="API.INVALID_END_DATETIME_FORMAT") description="API.INVALID_END_DATETIME_FORMAT")