Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
修改edu/examrecord
This commit is contained in:
commit
f4e003b9f0
|
@ -687,7 +687,7 @@ class ApkViewSet(MyLoggingMixin, ListModelMixin, CreateModelMixin, GenericViewSe
|
||||||
|
|
||||||
class MyScheduleViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, CustomGenericViewSet):
|
class MyScheduleViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, CustomGenericViewSet):
|
||||||
perms_map = {'get': '*', 'post': '*',
|
perms_map = {'get': '*', 'post': '*',
|
||||||
'delete': '*'}
|
'delete': 'myschedule.delete'}
|
||||||
serializer_class = MyScheduleSerializer
|
serializer_class = MyScheduleSerializer
|
||||||
create_serializer_class = MyScheduleCreateSerializer
|
create_serializer_class = MyScheduleCreateSerializer
|
||||||
queryset = MySchedule.objects.all()
|
queryset = MySchedule.objects.all()
|
||||||
|
@ -703,8 +703,9 @@ class MyScheduleViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Cus
|
||||||
def get_chinese_description(self, type: str = 'interval', data: dict = {}):
|
def get_chinese_description(self, type: str = 'interval', data: dict = {}):
|
||||||
"""转换为汉语描述
|
"""转换为汉语描述
|
||||||
"""
|
"""
|
||||||
|
print(data)
|
||||||
if type == 'interval':
|
if type == 'interval':
|
||||||
return f"每隔{data['every']}{data['period']}"
|
return f"每隔{data['every']}{self.period_dict[data['period']]}"
|
||||||
elif type == 'crontab':
|
elif type == 'crontab':
|
||||||
locale.setlocale(locale.LC_ALL, 'zh_CN.UTF-8')
|
locale.setlocale(locale.LC_ALL, 'zh_CN.UTF-8')
|
||||||
return get_description(f"{data['minute']} {data['hour']} {data['day_of_month']} {data['month_of_year']} {data['day_of_week']}")
|
return get_description(f"{data['minute']} {data['hour']} {data['day_of_month']} {data['month_of_year']} {data['day_of_week']}")
|
||||||
|
@ -720,7 +721,7 @@ class MyScheduleViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Cus
|
||||||
interval, _ = IntervalSchedule.objects.get_or_create(
|
interval, _ = IntervalSchedule.objects.get_or_create(
|
||||||
**interval_data, defaults=interval_data)
|
**interval_data, defaults=interval_data)
|
||||||
obj = MySchedule(**vdata)
|
obj = MySchedule(**vdata)
|
||||||
obj.name = self.get_chinese_description('interval', vdata)
|
obj.name = self.get_chinese_description('interval', interval_data)
|
||||||
obj.interval = interval
|
obj.interval = interval
|
||||||
obj.save()
|
obj.save()
|
||||||
elif vdata['type'] == 20:
|
elif vdata['type'] == 20:
|
||||||
|
@ -728,7 +729,7 @@ class MyScheduleViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, Cus
|
||||||
crontab, _ = CrontabSchedule.objects.get_or_create(
|
crontab, _ = CrontabSchedule.objects.get_or_create(
|
||||||
**crontab_data, defaults=crontab_data)
|
**crontab_data, defaults=crontab_data)
|
||||||
obj = MySchedule(**vdata)
|
obj = MySchedule(**vdata)
|
||||||
obj.name = self.get_chinese_description('crontab', vdata)
|
obj.name = self.get_chinese_description('crontab', crontab_data)
|
||||||
obj.crontab = crontab
|
obj.crontab = crontab
|
||||||
obj.save()
|
obj.save()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue