prog1764/dokogen187
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: вкладка «Субъект» — как в опроснике (5 полей)

Browse Source 
- Наименование организации, эксплуатирующей объект
- Адрес местонахождения
- Элемент (компонент) объекта, который эксплуатируется лицом
- ИНН лица, эксплуатирующего объект
- КПП его обособленных подразделений

Убраны лишние поля субъекта (руководитель, отв. за безопасность, подразделение, телефон, email), модель/UI/импорт/variables приведены в соответствие
This commit is contained in:
prog1764
2026-08-04 15:35:53 +04:00
parent ed71343d92
commit ffbe96d8c0
4 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dokogen/ui.py
+8 -43
View File
@@ -846,18 +846,11 @@ class DokoGenApp:
subj_frame = ttk.Frame(subj_tab, padding=8)
subj_frame.pack(fill=tk.BOTH, expand=True)
subj_fields = [
("Наименование субъекта:", "is_subject_name_entry"),
("Наименование организации, эксплуатирующей объект:", "is_subject_name_entry"),
("Адрес местонахождения:", "is_subject_address_entry"),
("Должность руководителя:", "is_subject_chief_position_entry"),
("ФИО руководителя:", "is_subject_chief_fio_entry"),
("Должность отв. за безопасность:", "is_subject_security_position_entry"),
("ФИО отв. за безопасность:", "is_subject_security_fio_entry"),
("Структурное подразделение:", "is_subject_department_entry"),
("Руководитель подразделения:", "is_subject_department_chief_entry"),
("Телефон:", "is_subject_phone_entry"),
("Эл. почта:", "is_subject_email_entry"),
("ИНН субъекта:", "is_subject_inn_entry"),
("КПП обособленных подразделений:", "is_subject_kpp_entry"),
("Элемент (компонент) объекта, который эксплуатируется лицом:", "is_subject_element_entry"),
("ИНН лица, эксплуатирующего объект:", "is_subject_inn_entry"),
("КПП его обособленных подразделений:", "is_subject_kpp_entry"),
]
for i, (label, attr) in enumerate(subj_fields):
ttk.Label(subj_frame, text=label).grid(row=i, column=0, sticky=tk.W, pady=2)
@@ -1176,14 +1169,7 @@ class DokoGenApp:
('is_typical_object_combo', 'typical_object'),
('is_subject_name_entry', 'subject_name'),
('is_subject_address_entry', 'subject_address'),
('is_subject_chief_position_entry', 'subject_chief_position'),
('is_subject_chief_fio_entry', 'subject_chief_fio'),
('is_subject_security_position_entry', 'subject_security_position'),
('is_subject_security_fio_entry', 'subject_security_fio'),
('is_subject_department_entry', 'subject_department'),
('is_subject_department_chief_entry', 'subject_department_chief'),
('is_subject_phone_entry', 'subject_phone'),
('is_subject_email_entry', 'subject_email'),
('is_subject_element_entry', 'subject_element'),
('is_subject_inn_entry', 'subject_inn'),
('is_subject_kpp_entry', 'subject_kpp'),
('is_net_category_entry', 'net_category'),
@@ -1416,14 +1402,7 @@ class DokoGenApp:
('is_typical_object_combo', 'typical_object'),
('is_subject_name_entry', 'subject_name'),
('is_subject_address_entry', 'subject_address'),
('is_subject_chief_position_entry', 'subject_chief_position'),
('is_subject_chief_fio_entry', 'subject_chief_fio'),
('is_subject_security_position_entry', 'subject_security_position'),
('is_subject_security_fio_entry', 'subject_security_fio'),
('is_subject_department_entry', 'subject_department'),
('is_subject_department_chief_entry', 'subject_department_chief'),
('is_subject_phone_entry', 'subject_phone'),
('is_subject_email_entry', 'subject_email'),
('is_subject_element_entry', 'subject_element'),
('is_subject_inn_entry', 'subject_inn'),
('is_subject_kpp_entry', 'subject_kpp'),
('is_net_category_entry', 'net_category'),
@@ -1490,14 +1469,7 @@ class DokoGenApp:
typical_object=src.typical_object,
subject_name=src.subject_name,
subject_address=src.subject_address,
subject_chief_position=src.subject_chief_position,
subject_chief_fio=src.subject_chief_fio,
subject_security_position=src.subject_security_position,
subject_security_fio=src.subject_security_fio,
subject_department=src.subject_department,
subject_department_chief=src.subject_department_chief,
subject_phone=src.subject_phone,
subject_email=src.subject_email,
subject_element=src.subject_element,
subject_inn=src.subject_inn,
subject_kpp=src.subject_kpp,
net_category=src.net_category,
@@ -2061,14 +2033,7 @@ class DokoGenApp:
typical_object=is_data.get('typical_object', ''),
subject_name=is_data.get('subject_name', ''),
subject_address=is_data.get('subject_address', ''),
subject_chief_position=is_data.get('subject_chief_position', ''),
subject_chief_fio=is_data.get('subject_chief_fio', ''),
subject_security_position=is_data.get('subject_security_position', ''),
subject_security_fio=is_data.get('subject_security_fio', ''),
subject_department=is_data.get('subject_department', ''),
subject_department_chief=is_data.get('subject_department_chief', ''),
subject_phone=is_data.get('subject_phone', ''),
subject_email=is_data.get('subject_email', ''),
subject_element=is_data.get('subject_element', ''),
subject_inn=is_data.get('subject_inn', ''),
subject_kpp=is_data.get('subject_kpp', ''),
net_category=is_data.get('net_category', ''),