P300021/poli_planning
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: P300021:2fa124f529fbc134830d4c11c683ad1149d94ffa
Branches Tags
P300021:master
..
compare: P300021:d7a58053f53af45fa171014105255f3abacab9ca
Branches Tags
P300021:master

No commits in common. "2fa124f529fbc134830d4c11c683ad1149d94ffa" and "d7a58053f53af45fa171014105255f3abacab9ca" have entirely different histories.
2fa124f529 ... d7a58053f5

2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
polyclinic_scheduling/apps/schedule/admin.py
View File

@ -6,7 +6,7 @@ from .models import Schedule
@admin.register(Schedule) @admin.register(Schedule)
class ScheduleAdmin(admin.ModelAdmin): class ScheduleAdmin(admin.ModelAdmin):
list_display = ('name', 'employee', 'email', 'created_at', 'processed') list_display = ('name', 'employee', 'email', 'created_at', 'processed')
ordering = ('created_at', 'name',) ordering = ('name', 'created_at')
search_fields = ('name', 'email') search_fields = ('name', 'email')
def processed(self,obj): def processed(self,obj):

3
polyclinic_scheduling/apps/schedule/views.py
View File

@ -31,7 +31,8 @@ def new_or_update_study(request, schedule = None):
try: try:
new_schedule.planning_source = json.loads(schedule_form.cleaned_data['json']) new_schedule.planning_source = json.loads(schedule_form.cleaned_data['json'])
except json.JSONDecodeError as ex: except json.JSONDecodeError as ex:
new_schedule.planning_source = json.loads(json.dumps({'error': str(ex)})) # For now, sorry, ignore
pass
new_schedule.employee = request.user.employee new_schedule.employee = request.user.employee
new_schedule.name = schedule_form.cleaned_data['name'] new_schedule.name = schedule_form.cleaned_data['name']