Skip to content

Commit 8997fc7

Browse files
gelfikgelfik
committed
Add A, B, C, POL, CHL
1 parent 93e75f8 commit 8997fc7

File tree

22 files changed

+792
-415
lines changed

22 files changed

+792
-415
lines changed

‎db.sqlite3‎

-228 KB
Binary file not shown.

‎prototipe/admin.py‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
from django.contrib import admin
2-
from .models import predmet, test, voprosi, test_for_user, test_for_user_voprosi
2+
from django.contrib.auth.models import User
3+
from .models import type_sciences, predmet, test, voprosi, test_for_user, test_for_user_voprosi
34
# from .models import user_data, users_lvl, auth_token
45
# Register your models here.
56

7+
@admin.register(type_sciences)
8+
class type_sciences_list(admin.ModelAdmin):
9+
list_display = ['sciences_name']
10+
611
@admin.register(predmet)
712
class predmet_list(admin.ModelAdmin):
8-
list_display = ('predmet_name_sokr', 'predmet_name', 'predmet_name_sokr_translite')
13+
list_display = ('predmet_name_sokr', 'predmet_name', 'type_sciences_id', 'predmet_name_sokr_translite')
914

1015
@admin.register(test)
1116
class test_list(admin.ModelAdmin):
1217
list_display = ('test_name', 'valid_date', 'predmet_id', 'voprosi_count', 'create_user_id')
1318

1419
@admin.register(voprosi)
1520
class voprosi_list(admin.ModelAdmin):
16-
list_display = ('vopros', 'otvet', 'test_id')
21+
list_display = ('vopros', 'otvet', 'test_id', 'A_score' , 'B_score' , 'C_score' , 'POL_score' , 'CHL_score')
1722

1823
@admin.register(test_for_user)
1924
class test_for_user(admin.ModelAdmin):
@@ -23,14 +28,6 @@ class test_for_user(admin.ModelAdmin):
2328
class test_for_user_voprosi(admin.ModelAdmin):
2429
list_display = ('test_for_user_id', 'user_id', 'voprose_num', 'voprosi_id', 'otvet_user', 'otvet_status')
2530

26-
# @admin.register(user_data)
27-
# class BookAdmin(admin.ModelAdmin):
28-
# list_display = ('user_name', 'last_name', 'first_name', 'patronymic', 'id_users_lvl', 'email', 'password')
29-
#
30-
# @admin.register(users_lvl)
31-
# class BookAdmin(admin.ModelAdmin):
32-
# list_display = ('id', 'lvl_name')
33-
#
34-
# @admin.register(auth_token)
35-
# class BookAdmin(admin.ModelAdmin):
36-
# list_display = ('id', 'id_user', 'token')
31+
# @admin.register(User)
32+
# class User_list(admin.ModelAdmin):
33+
# list_display = ('username', 'email')

‎prototipe/migrations/0001_initial.py‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎prototipe/migrations/0002_test_for_user_override_status.py‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎prototipe/migrations/0003_auto_20201003_0507.py‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎prototipe/migrations/0004_auto_20201004_1707.py‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎prototipe/models.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,23 @@ def random(self, test_id):
2121
print(answer)
2222
return answer
2323

24+
class type_sciences(models.Model):
25+
sciences_name = models.CharField('Название науки', max_length=100, default=None)
26+
27+
class Meta:
28+
verbose_name = 'Вид науки'
29+
verbose_name_plural = 'Виды наук'
30+
db_table = 'type_sciences'
31+
32+
def __str__(self):
33+
return self.sciences_name
2434

2535
class predmet(models.Model):
2636
predmet_name = models.CharField('Название предмета', max_length=256, default=None, unique=True)
2737
predmet_name_sokr = models.CharField('Название предмета сокращенно', max_length=20, default=None, unique=True)
2838
predmet_name_sokr_translite = models.CharField('Название предмета сокращенно англ', max_length=30, default=None,
2939
blank=True, unique=True)
40+
type_sciences_id = models.ForeignKey(type_sciences, on_delete=models.CASCADE, verbose_name='Наука', default=None)
3041

3142
def save(self, *args, **kwargs):
3243
def translit(text):
@@ -74,6 +85,11 @@ class voprosi(models.Model):
7485
vopros = models.TextField('Вопрос', default=None)
7586
otvet = models.CharField('Ответ', max_length=256, default=None)
7687
test_id = models.ForeignKey(test, on_delete=models.CASCADE, verbose_name='Тест')
88+
A_score = models.FloatField('Формализационная оценка', default=0)
89+
B_score = models.FloatField('Конструктивная оценка', default=0)
90+
C_score = models.FloatField('Исполнительская оценка', default=0)
91+
POL_score = models.FloatField('Исполнительская оценка', default=0)
92+
CHL_score = models.FloatField('Исполнительская оценка', default=0)
7793

7894
objects = RandomManager()
7995

‎prototipe/templates/prototipe/admin/predmets.html‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@
2525
<th scope="col">Предмет</th>
2626
<th scope="col">Сокращение</th>
2727
<th scope="col">Сокращение англ.</th>
28+
<th scope="col">Вид науки</th>
2829
</tr>
2930
</thead>
3031
<tbody>
3132
{% for predmet in arguments.predmets %}
3233
<tr role="button" data-toggle="modal" data-target="#EditModal_{{ predmet.id }}">
33-
<th scope="row" data-toggle="tooltip" data-placement="bottom" title="Нажмите для редактирования">{{ predmet.predmet_name }}</th>
34-
<td data-toggle="tooltip" data-placement="bottom" title="Нажмите для редактирования">{{ predmet.predmet_name_sokr }}</td>
35-
<td data-toggle="tooltip" data-placement="bottom" title="Нажмите для редактирования">{{ predmet.predmet_name_sokr_translite }}</td>
34+
<th scope="row" data-toggle="tooltip" data-placement="bottom"
35+
title="Нажмите для редактирования">{{ predmet.predmet_name }}</th>
36+
<td data-toggle="tooltip" data-placement="bottom"
37+
title="Нажмите для редактирования">{{ predmet.predmet_name_sokr }}</td>
38+
<td data-toggle="tooltip" data-placement="bottom"
39+
title="Нажмите для редактирования">{{ predmet.predmet_name_sokr_translite }}</td>
40+
<td data-toggle="tooltip" data-placement="bottom"
41+
title="Нажмите для редактирования">{{ predmet.type_sciences_id.sciences_name }}</td>
3642
</tr>
3743
{% endfor %}
3844
</tbody>
@@ -59,6 +65,16 @@ <h5 class="modal-title" id="AddModalLabel">Добавление нового п
5965
<form method="post">
6066
{% csrf_token %}
6167
<div class="modal-body">
68+
<div class="form-group">
69+
<label for="sciences_name">Вид науки</label>
70+
<select class="form-control" id="sciences_name" name="TypeSciences">
71+
{% if arguments.type_sciences %}
72+
{% for science in arguments.type_sciences %}
73+
<option value="{{ science.sciences_name }}">{{ science.sciences_name }}</option>
74+
{% endfor %}
75+
{% endif %}
76+
</select>
77+
</div>
6278
<div class="form-group">
6379
<label for="PredmetName">Название предмета</label>
6480
<input type="text" class="form-control" id="PredmetName" name="PredmetName"
@@ -96,6 +112,22 @@ <h5 class="modal-title" id="EditModalLabel_{{ predmet.id }}">Редактирв
96112
<form action="/adm/predmets/{{ predmet.id }}">
97113
{% csrf_token %}
98114
<div class="modal-body">
115+
<div class="form-group">
116+
<label for="sciences_name">Вид науки</label>
117+
<select class="form-control" id="sciences_name"
118+
name="TypeSciences_{{ predmet.id }}">
119+
{% if arguments.type_sciences %}
120+
{% for science in arguments.type_sciences %}
121+
{% if science.sciences_name == predmet.type_sciences_id.sciences_name %}
122+
<option value="{{ science.sciences_name }}"
123+
selected>{{ science.sciences_name }}</option>
124+
{% else %}
125+
<option value="{{ science.sciences_name }}">{{ science.sciences_name }}</option>
126+
{% endif %}
127+
{% endfor %}
128+
{% endif %}
129+
</select>
130+
</div>
99131
<div class="form-group">
100132
<label for="PredmetName">Название предмета</label>
101133
<input type="text" class="form-control" id="PredmetName_{{ predmet.id }}"

0 commit comments

Comments
 (0)