Compare commits
2 Commits
7a02bbb262
...
89486d7c97
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89486d7c97 | ||
|
|
dfa604e846 |
@@ -29,7 +29,12 @@ from PySide6.QtWidgets import (
|
||||
)
|
||||
|
||||
from docketModel import docketModel
|
||||
from lib.utils import QStyleOptionViewItemInit, query_error, readGeometry, writeGeometry
|
||||
from lib.utils import (
|
||||
QStyleOptionViewItemInit,
|
||||
query_error,
|
||||
readGeometry,
|
||||
writeGeometry,
|
||||
)
|
||||
from ui.MainWindow import Ui_MainWindow
|
||||
from workers import loadCases, updateThread
|
||||
|
||||
@@ -181,17 +186,19 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
layout.addWidget(self.status)
|
||||
layout.addStretch()
|
||||
self.progress = QProgressBar()
|
||||
self.progress.setRange(0,100)
|
||||
self.progress.setRange(0, 100)
|
||||
self.progress.setValue(0)
|
||||
self.progress.setMinimumWidth(150)
|
||||
self.progress.setMaximumWidth(150)
|
||||
self.progress.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
|
||||
self.progress.setSizePolicy(
|
||||
QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred
|
||||
)
|
||||
layout.addWidget(self.progress)
|
||||
self.loadButton = QPushButton()
|
||||
self.loadButton.setObjectName("loadButton")
|
||||
self.loadButton.setText("Load Cases")
|
||||
layout.addWidget(self.loadButton)
|
||||
self.statusbar.addWidget(widget,10)
|
||||
self.statusbar.addWidget(widget, 10)
|
||||
|
||||
self.loadButton.clicked.connect(self.loadCases)
|
||||
self.update_status.connect(self.statusBarUpdate)
|
||||
@@ -212,6 +219,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.loadButton.setEnabled(False)
|
||||
self.loadThread.start()
|
||||
return
|
||||
|
||||
@Slot()
|
||||
def loadCasesDone(self) -> None:
|
||||
self.loadButton.setEnabled(True)
|
||||
@@ -221,27 +229,31 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
@Slot()
|
||||
def statusBarUpdate(self) -> None:
|
||||
if self.loadThread is None:
|
||||
year = ''
|
||||
max = 'unknown'
|
||||
year = ""
|
||||
max = "unknown"
|
||||
else:
|
||||
year = self.loadThread.year
|
||||
max = self.loadThread.number
|
||||
max = str(self.loadThread.number)
|
||||
query = QSqlQuery()
|
||||
query.prepare("SELECT COUNT(*) AS number_active FROM cases WHERE active=1")
|
||||
query.prepare(
|
||||
"SELECT COUNT(*) AS number_active FROM cases WHERE active=1"
|
||||
)
|
||||
if not query.exec():
|
||||
query_error(query)
|
||||
if query.next():
|
||||
active = query.value('number_active')
|
||||
query.prepare("select SUBSTRING(docket_id,1,2) AS year, "
|
||||
active = query.value("number_active")
|
||||
query.prepare(
|
||||
"select SUBSTRING(docket_id,1,2) AS year, "
|
||||
"SUBSTRING(docket_id,3,1) AS type, "
|
||||
"MAX(CAST(SUBSTRING(docket_id,4) AS INTEGER)) AS number "
|
||||
"FROM cases "
|
||||
"GROUP BY year, type "
|
||||
"ORDER BY type, year, number"
|
||||
"LIMIT 2")
|
||||
#if not query.exec():
|
||||
"LIMIT 2"
|
||||
)
|
||||
# if not query.exec():
|
||||
# query_error(query)
|
||||
msg=f"Oldest: {year}, Active: {active}, Max. Case: {max}"
|
||||
msg = f"Oldest: {year}, Active: {active}, Max. Case: {max}"
|
||||
self.status.setText(msg)
|
||||
return
|
||||
|
||||
|
||||
@@ -33,18 +33,21 @@ class Entries(db.Entity): # type: ignore[name-defined]
|
||||
text = Required(LongStr)
|
||||
documents = Set("Documents")
|
||||
|
||||
|
||||
class Documents(db.Entity): # type: ignore[name-defined]
|
||||
document_id = PrimaryKey(int, auto=True)
|
||||
entry_id = Required(Entries)
|
||||
name = Required(str)
|
||||
url = Required(LongStr)
|
||||
|
||||
|
||||
class History(db.Entity): # type: ignore[name-defined]
|
||||
history_id = PrimaryKey(int, auto=True)
|
||||
year = Required(str, max_len=3)
|
||||
edocket = Required(bool)
|
||||
number = Required(int)
|
||||
|
||||
|
||||
def updateDatabase(settings: QSettings) -> None:
|
||||
set_sql_debug(True)
|
||||
engine = settings.value("engine")
|
||||
|
||||
10
workers.py
10
workers.py
@@ -80,7 +80,6 @@ def update_proceedings(
|
||||
if not query.exec():
|
||||
query_error(query)
|
||||
assert isinstance(text, str)
|
||||
print(f"text: {text.lower()}")
|
||||
#
|
||||
# If cert is denied, a petion for rehearing can be requested.
|
||||
# The petitioner has 40 days to file for a rehearing.
|
||||
@@ -156,9 +155,7 @@ def update_db(case_id: str, db: QSqlDatabase) -> int:
|
||||
assert isinstance(tmp, str)
|
||||
matches = re.match(r"(No.)?\s*(\d+[-A]\d+).*$", tmp)
|
||||
assert matches is not None
|
||||
print(matches, matches.groups())
|
||||
docket_id = matches.group(2)
|
||||
print(f"Found {docket_id}")
|
||||
|
||||
#
|
||||
# Title is second row, first column
|
||||
@@ -288,7 +285,6 @@ class updateThread(QThread):
|
||||
|
||||
def __init__(self) -> None:
|
||||
super(updateThread, self).__init__()
|
||||
print("updateThread: __init__(docket_id)")
|
||||
return
|
||||
|
||||
def setDocketId(self, docket_id: str) -> None:
|
||||
@@ -296,7 +292,6 @@ class updateThread(QThread):
|
||||
return
|
||||
|
||||
def run(self) -> None:
|
||||
print(f"updateThread: running on {self.currentThread()}")
|
||||
db = QSqlDatabase.cloneDatabase("qt_sql_default_connection", "update")
|
||||
if not db.open():
|
||||
print(db.lastError())
|
||||
@@ -306,7 +301,6 @@ class updateThread(QThread):
|
||||
db.close()
|
||||
del db
|
||||
QSqlDatabase.removeDatabase("update")
|
||||
print(f"updateThread: run() returns {case_id}")
|
||||
return
|
||||
|
||||
|
||||
@@ -322,7 +316,6 @@ class loadCases(QThread):
|
||||
|
||||
query = QSqlQuery(db)
|
||||
query.prepare("SELECT * FROM history WHERE year = :year")
|
||||
print(f"year = {self.year}")
|
||||
query.bindValue(":year", self.year)
|
||||
if not query.exec():
|
||||
query_error(query)
|
||||
@@ -356,11 +349,9 @@ class loadCases(QThread):
|
||||
query_error(query)
|
||||
if query.next():
|
||||
if query.value("active") == 0:
|
||||
print("Already exists and is inactive")
|
||||
self.number += 1
|
||||
continue
|
||||
result = update_db(docket_id, db)
|
||||
print(f"result: {result}")
|
||||
if result < 0:
|
||||
self.year = f"{int(self.year) - 1:02d}"
|
||||
if self.number > 1:
|
||||
@@ -373,7 +364,6 @@ class loadCases(QThread):
|
||||
query_error(query)
|
||||
|
||||
query.prepare("SELECT * FROM history WHERE year = :year")
|
||||
print(f"year = {self.year}")
|
||||
query.bindValue(":year", self.year)
|
||||
if not query.exec():
|
||||
query_error(query)
|
||||
|
||||
Reference in New Issue
Block a user