Skip to content

Commit

Permalink
Update date processing
Browse files Browse the repository at this point in the history
  • Loading branch information
JanisV committed Mar 5, 2024
1 parent 9d5e06b commit 38d5c9c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions OpenNumismat/PaySaleModule.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import datetime

import dateutil.parser
# import dateutil.parser
from PySide6.QtCore import Qt
from PySide6.QtSql import QSqlQueryModel, QSqlQuery
# from PySide6.QtWidgets import *
Expand Down Expand Up @@ -64,7 +64,8 @@ def __init__(self, uid, places, rec=None):
self.setLayout(self.layout)

if self.rec:
self.fld_date.setDate(dateutil.parser.parse(str(rec[2])))
# self.fld_date.setDate(dateutil.parser.parse(str(rec[2])))
self.fld_date.setDate(datetime.datetime.strptime(str(rec[2]), "%d.%m.%Y"))
_act = self.fld_act.findText(str(rec[3]))
if _act != -1:
self.fld_act.setCurrentIndex(_act)
Expand Down Expand Up @@ -133,7 +134,7 @@ def __init__(self, title, uid, places, _ftype, _tq, _ts):
self.tq = _tq
self.ts = _ts
self.places = places
self.sel_query = ("select * from coins_paysales where coin_id = %s" % uid)
self.sel_query = ("select * from coins_paysales where coin_id = %s order by cast(substr(oper_date, 7,4)||substr(oper_date, 4,2)||substr(oper_date, 1,2) as int) desc" % uid)
self.tbl_view = None
self.model = None

Expand Down Expand Up @@ -176,6 +177,10 @@ def setTblViewLayout(self):
self.tbl_view.hideColumn(0)
self.tbl_view.hideColumn(1)
self.tbl_view.verticalHeader().setVisible(False)
self.tbl_view.verticalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
# self.tbl_view.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
self.tbl_view.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
self.tbl_view.horizontalHeader().setStretchLastSection(True)
self.tbl_view.setSelectionBehavior(QAbstractItemView.SelectRows)
self.tbl_view.setSelectionMode(QAbstractItemView.SingleSelection)

Expand Down
2 changes: 1 addition & 1 deletion OpenNumismat/Reference/ReferenceDialog.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys

from PySide6.QtCore import Qt, QByteArray, QFileInfo, QIODevice, QBuffer, QRect, QPoint
from PySide6.QtGui import QImage, QKeySequence, QPainter
from PySide6.QtGui import QImage, QKeySequence, QPainter, QImageReader
from PySide6.QtWidgets import *

import OpenNumismat
Expand Down
2 changes: 1 addition & 1 deletion OpenNumismat/SettingsDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from PySide6.QtCore import Qt, QMargins, QT_TRANSLATE_NOOP
from PySide6.QtCore import Signal as pyqtSignal
from PySide6.QtGui import QIcon, QAction, QPixmap
from PySide6.QtGui import QIcon, QAction, QPixmap, QColor
from PySide6.QtWidgets import *

from OpenNumismat.EditCoinDialog.FormItems import NumberEdit
Expand Down

0 comments on commit 38d5c9c

Please sign in to comment.