Further cleanup
This commit is contained in:
@@ -13,7 +13,7 @@ from backend.db.models import *
|
||||
import logging
|
||||
from .pop_ups import AlertPop
|
||||
from .functions import select_open_file
|
||||
from tools import readInChunks, Settings
|
||||
from tools import Settings
|
||||
|
||||
logger = logging.getLogger(f"submissions.{__name__}")
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from PyQt6.QtCore import Qt, QAbstractTableModel, QSortFilterProxyModel
|
||||
from PyQt6.QtGui import QAction, QCursor
|
||||
from backend.db.models import BasicSubmission
|
||||
from backend.excel import make_report_html, make_report_xlsx
|
||||
from tools import Report, Result, get_first_blank_df_row, row_map
|
||||
from tools import Report, Result, row_map
|
||||
from xhtml2pdf import pisa
|
||||
from .functions import select_save_file, select_open_file
|
||||
from .misc import ReportDatePicker
|
||||
|
||||
@@ -137,12 +137,12 @@ class SubmissionFormContainer(QWidget):
|
||||
return
|
||||
# create sheetparser using excel sheet and context from gui
|
||||
try:
|
||||
self.prsr = SheetParser(ctx=self.app.ctx, filepath=fname)
|
||||
self.prsr = SheetParser(filepath=fname)
|
||||
except PermissionError:
|
||||
logger.error(f"Couldn't get permission to access file: {fname}")
|
||||
return
|
||||
except AttributeError:
|
||||
self.prsr = SheetParser(ctx=self.app.ctx, filepath=fname)
|
||||
self.prsr = SheetParser(filepath=fname)
|
||||
logger.debug(f"Submission dictionary:\n{pformat(self.prsr.sub)}")
|
||||
self.pyd = self.prsr.to_pydantic()
|
||||
logger.debug(f"Pydantic result: \n\n{pformat(self.pyd)}\n\n")
|
||||
|
||||
Reference in New Issue
Block a user