landon/Submissions-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moments before disaster.

Browse Source
This commit is contained in:
Landon Wark
2024-01-08 08:51:23 -06:00
parent 19448cc8f3
commit 8c688df75f
10 changed files with 445 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/submissions/frontend/widgets/equipment_usage.py
View File

@@ -96,7 +96,8 @@ class RoleComboBox(QWidget):
self.process.setMaximumWidth(125)
self.process.setMinimumWidth(125)
self.process.setEditable(True)
self.process.addItems(submission_type.get_processes_for_role(equipment_role=role.name))
# self.process.addItems(submission_type.get_processes_for_role(equipment_role=role.name))
self.process.addItems(role.processes)
self.layout.addWidget(self.check)
self.layout.addWidget(QLabel(f"{role.name}:"))
self.layout.addWidget(self.box)
@@ -107,7 +108,7 @@ class RoleComboBox(QWidget):
def parse_form(self) -> str|None:
eq = Equipment.query(name=self.box.currentText())
if self.check:
return PydEquipment(name=eq.name, processes=[self.process.currentText()], role=self.role.name, asset_number=eq.asset_number, nickname=eq.nickname)
return PydEquipment(name=eq.name, process=self.process.currentText(), role=self.role.name, asset_number=eq.asset_number, nickname=eq.nickname)
else:
return None

7
src/submissions/frontend/widgets/submission_table.py
View File

@@ -15,7 +15,7 @@ from PyQt6.QtWidgets import (
from PyQt6.QtWebEngineWidgets import QWebEngineView
from PyQt6.QtCore import Qt, QAbstractTableModel, QSortFilterProxyModel
from PyQt6.QtGui import QAction, QCursor, QPixmap, QPainter
from backend.db.models import BasicSubmission, Equipment, SubmissionEquipmentAssociation
from backend.db.models import BasicSubmission, Equipment, SubmissionEquipmentAssociation, Process
from backend.excel import make_report_html, make_report_xlsx
from tools import check_if_app, Report, Result, jinja_template_loading, get_first_blank_df_row, row_map
from xhtml2pdf import pisa
@@ -194,12 +194,13 @@ class SubmissionsSheet(QTableView):
for equip in equipment:
e = Equipment.query(name=equip.name)
assoc = SubmissionEquipmentAssociation(submission=submission, equipment=e)
assoc.process = equip.processes[0]
process = Process.query(name=equip.process)
assoc.process = process
assoc.role = equip.role
# submission.submission_equipment_associations.append(assoc)
logger.debug(f"Appending SubmissionEquipmentAssociation: {assoc}")
# submission.save()
# assoc.save()
assoc.save()
def delete_item(self, event):
"""