radboy 0.0.827__tar.gz → 0.0.829__tar.gz

{radboy-0.0.827 → radboy-0.0.829}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.827
+Version: 0.0.829
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.829/STDOUT.TXT

@@ -0,0 +1,15 @@
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"dl"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"dl"
+#USER INPUT# -> :"sal"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"lu"
+#USER INPUT# -> :"sal"
+#USER INPUT# -> :"test"
+#USER INPUT# -> :"water"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.829"

{radboy-0.0.827 → radboy-0.0.829}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.827"
+version = "0.0.829"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.827 → radboy-0.0.829}/radboy/DB/db.py

@@ -1187,9 +1187,9 @@ For hot food, one of the notable exceptions is "Hot Baked Goods," like pretzels
     ShelfCount=Column(Integer,default=0)
     #LoadCount=1,PalletCount=1,ShelfCount=1
 
-    Expiry=Column(DateTime,default=None)
-    BestBy=Column(DateTime,default=None)
-    AquisitionDate=Column(DateTime,default=None)
+    Expiry=Column(DateTime,default=datetime(1,1,1))
+    BestBy=Column(DateTime,default=datetime(1,1,1))
+    AquisitionDate=Column(DateTime,default=datetime(1,1,1))
     '''
     #__init__ def #AquisitionDate=None,BestBy=None,Expiry=None
     
@@ -1304,7 +1304,7 @@ For hot food, one of the notable exceptions is "Hot Baked Goods," like pretzels
             if k in [s.name for s in self.__table__.columns]:
                 setattr(self,k,kwargs.get(k))
 
-    def __init__(self,Barcode,Code,upce2upca='',Name='',InList=True,Price=0.0,Note='',Size='',CaseCount=1,Shelf=0,BackRoom=0,Display_1=0,Display_2=0,Display_3=0,Display_4=0,Display_5=0,Display_6=0,Stock_Total=0,Timestamp=datetime.now().timestamp(),EntryId=None,Location='///',ListQty=0.0,Image='',CHKSTND_SPLY=0,WD_DSPLY=0,FLRL_CHP_DSPLY=0,FLRL_WTR_DSPLY=0,SBX_WTR_KLR=0,SBX_CHP_DSPLY=0,SBX_WTR_DSPLY=0,Facings=0,Tags='',CaseID_6W='',CaseID_BR='',CaseID_LD='',ALT_Barcode='',DUP_Barcode='',CRV=0.0,Tax=0.0,TaxNote='',userUpdated=False,LoadCount=1,PalletCount=1,ShelfCount=1,Description='',Distress=0,UnitsDeep=1,UnitsHigh=1,AquisitionDate=None,BestBy=None,Expiry=None):
+    def __init__(self,Barcode,Code,upce2upca='',Name='',InList=True,Price=0.0,Note='',Size='',CaseCount=1,Shelf=0,BackRoom=0,Display_1=0,Display_2=0,Display_3=0,Display_4=0,Display_5=0,Display_6=0,Stock_Total=0,Timestamp=datetime.now().timestamp(),EntryId=None,Location='///',ListQty=0.0,Image='',CHKSTND_SPLY=0,WD_DSPLY=0,FLRL_CHP_DSPLY=0,FLRL_WTR_DSPLY=0,SBX_WTR_KLR=0,SBX_CHP_DSPLY=0,SBX_WTR_DSPLY=0,Facings=0,Tags='',CaseID_6W='',CaseID_BR='',CaseID_LD='',ALT_Barcode='',DUP_Barcode='',CRV=0.0,Tax=0.0,TaxNote='',userUpdated=False,LoadCount=1,PalletCount=1,ShelfCount=1,Description='',Distress=0,UnitsDeep=1,UnitsHigh=1,AquisitionDate=datetime(1,1,1),BestBy=datetime(1,1,1),Expiry=datetime(1,1,1)):
         if EntryId:
             self.EntryId=EntryId
         self.CRV=CRV
@@ -1386,6 +1386,18 @@ For hot food, one of the notable exceptions is "Hot Baked Goods," like pretzels
         self.ShelfCount=ShelfCount
         self.PalletCount=PalletCount
         self.LoadCount=LoadCount
+        if Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        else:
+            self.Expiry=Expiry
+        if BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        else:
+            self.BestBy=BestBy
+        if AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
+        else:
+            self.AquisitionDate=AquisitionDate
         #CHKSTND_SPLY=0,WD_DSPLY=0,FLRL_CHP_DSPLY=0,FLRL_WTR_DSPLY=0,SBX_WTR_KLR=0,SBX_CHP_DSPLY=0,SBX_WTR_DSPLY=0,Facings=0,Tags='',CaseID_6W='',CaseID_BR='',CaseID_LD='',ALT_Barcode='',DUP_Barcode=''
 
         '''
@@ -1604,6 +1616,12 @@ For hot food, one of the notable exceptions is "Hot Baked Goods," like pretzels
         return result
 
     def saveListExtended(self,num):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         if self.LCL_ANDROID.exists():
             self.LCL=self.LCL_ANDROID
         total=self.Display_1+self.Display_2+self.Display_3+self.Display_4+self.Display_5+self.Display_6+self.Shelf+self.BackRoom
@@ -1646,9 +1664,9 @@ CHKSTND_SPLY={self.CHKSTND_SPLY}
 Distress={self.Distress} #not added to total
 Total = {total}
 Total(w/o BR+) - Backroom = {(total-self.BackRoom)-self.BackRoom}
-Expiry = {self.Expiry}
-BestBy = {self.BestBy}
-AquisitionDate = {self.AquisitionDate}
+Expiry = {self.Expiry}[{self.Expiry-datetime.now()} old]
+BestBy = {self.BestBy}[{self.BestBy-datetime.now()} old]
+AquisitionDate = {self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]
 -------------{num}-------------
 """
         
@@ -1707,6 +1725,12 @@ Facings={self.Facings}
         return total
 
     def listdisplay_extended(self,num):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         #print(self.csv_headers())
         #print(self.csv_values())
         total=self.Display_1+self.Display_2+self.Display_3+self.Display_4+self.Display_5+self.Display_6+self.Shelf+self.BackRoom
@@ -1767,9 +1791,9 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
 {Fore.medium_violet_red}Total Product Handled/To Be Handled Value*CaseCount: {Fore.spring_green_3a}{total_value_case}{Style.reset}
 {Fore.orange_3}Distressed Product:{Fore.light_red}{self.Distress}{Style.reset}
 ------------- Dates ----------------------
-{Fore.light_cyan}Expiry = {Fore.light_green}{self.Expiry}{Style.reset}
-{Fore.light_cyan}BestBy = {Fore.light_green}{self.BestBy}{Style.reset}
-{Fore.light_cyan}AquisitionDate = {Fore.light_green}{self.AquisitionDate}{Style.reset}
+{Fore.light_cyan}Expiry = {Fore.light_green}{self.Expiry}[{self.Expiry-datetime.now()} old]{Style.reset}
+{Fore.light_cyan}BestBy = {Fore.light_green}{self.BestBy}[{self.BestBy-datetime.now()} old]{Style.reset}
+{Fore.light_cyan}AquisitionDate = {Fore.light_green}{self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]{Style.reset}
 -------------{Style.bold+Style.underline+Fore.orange_red_1}{num}{Style.reset}-------------
 """
         print(msg)
@@ -1856,6 +1880,12 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
 
     pinfo=f"{Back.green_3a}{Fore.red}**{Fore.white}{Style.bold}Product/Entry Info{Fore.red}- #REPLACE#**{Style.reset} "
     def __repr__(self):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         pinfo=self.pinfo
         total_value=self.total_value(CaseMode=False)
         total_value_case=self.total_value()
@@ -1919,9 +1949,9 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
         
         {Fore.orange_3}Distressed Product:{Fore.light_red}{self.Distress}{Style.reset}
         ------------- Dates -----------------
-        {Fore.light_cyan}Expiry{Fore.grey_70}[{types['Expiry']}{Fore.light_cyan}]={Fore.light_green}{self.Expiry}{Style.reset}
-        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}{Fore.light_cyan}]={Fore.light_green}{self.BestBy}{Style.reset}
-        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}{Fore.light_cyan}]={Fore.light_green}{self.AquisitionDate}{Style.reset}
+        {Fore.light_cyan}Expiry{Fore.grey_70}[{types['Expiry']}{Fore.light_cyan}]={Fore.light_green}{self.Expiry}[{self.Expiry-datetime.now()} old]{Style.reset}
+        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}{Fore.light_cyan}]={Fore.light_green}{self.BestBy}[{self.BestBy-datetime.now()} old]{Style.reset}
+        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}{Fore.light_cyan}]={Fore.light_green}{self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]{Style.reset}
 
         {Fore.sky_blue_2}Size{Style.reset}:{Fore.grey_70}{types['Size']}{Style.reset}={self.Size}
         {Fore.tan}Image[{Fore.dark_goldenrod}Exists:{Fore.deep_pink_3b}{self.imageExists()}{Style.reset}{Fore.tan}]{Style.reset}:{Fore.grey_70}{types['Image']}{Style.reset}={self.Image}
@@ -2091,9 +2121,9 @@ class DayLog(BASE,EntryExtras):
     WD_DSPLY=WD_DSPLY=Column(Integer)
     CHKSTND_SPLY=CHKSTND_SPLY=Column(Integer)
 
-    Expiry=Column(DateTime,default=None)
-    BestBy=Column(DateTime,default=None)
-    AquisitionDate=Column(DateTime,default=None)
+    Expiry=Column(DateTime,default=datetime(1,1,1))
+    BestBy=Column(DateTime,default=datetime(1,1,1))
+    AquisitionDate=Column(DateTime,default=datetime(1,1,1))
     '''
     #__init__ def #AquisitionDate=None,BestBy=None,Expiry=None
     
@@ -2195,7 +2225,7 @@ class DayLog(BASE,EntryExtras):
 {Fore.light_yellow}Name({Fore.pale_green_1b}{self.Name}{Fore.light_yellow}) {Fore.light_magenta}Price Per Unit({Fore.slate_blue_1}prc={self.Price}{Fore.light_magenta},crv={self.CRV},tax={self.Tax},ttl={formula}){Style.reset} {Fore.misty_rose_3}EID({Fore.pale_green_1b}{self.EntryId}{Fore.light_yellow}) {Fore.spring_green_3a}[BCD/UPC[A/E]/EAN[8/13]/GTIN](cd={Fore.light_magenta}{rebar},{Fore.chartreuse_1}no_sep={self.rebar(skip_sep=True)}{Fore.spring_green_3a}){Style.reset}{Fore.slate_blue_1} -{Fore.cyan}> {Fore.orange_red_1}[SHELF/TAG/CIC/STR_CD]({Fore.light_red}cd={self.cfmt(self.Code)}{Fore.orange_red_1},{Fore.light_steel_blue}DayLogId={self.DayLogId},{Fore.pale_green_1b}EntryId={self.EntryId}){Style.reset}'''
         return msg
 
-    def __init__(self,Barcode,Code,upce2upca='',Name='',InList=False,Price=0.0,Note='',Size='',CaseCount=0,Shelf=0,BackRoom=0,Display_1=0,Display_2=0,Display_3=0,Display_4=0,Display_5=0,Display_6=0,Stock_Total=0,Timestamp=datetime.now().timestamp(),EntryId=None,Location='///',ListQty=0.0,Image='',CHKSTND_SPLY=0,WD_DSPLY=0,FLRL_CHP_DSPLY=0,FLRL_WTR_DSPLY=0,SBX_WTR_KLR=0,SBX_CHP_DSPLY=0,SBX_WTR_DSPLY=0,Facings=0,Tags='',CaseID_6W='',CaseID_BR='',CaseID_LD='',ALT_Barcode='',DUP_Barcode='',DayLogDate=datetime.now(),DayLogId=None,CRV=0.0,Tax=0.0,TaxNote='',userUpdated=False,LoadCount=1,PalletCount=1,ShelfCount=1,Description='',Distress=0,UnitsDeep=1,UnitsHigh=1,AquisitionDate=None,BestBy=None,Expiry=None):
+    def __init__(self,Barcode,Code,upce2upca='',Name='',InList=False,Price=0.0,Note='',Size='',CaseCount=0,Shelf=0,BackRoom=0,Display_1=0,Display_2=0,Display_3=0,Display_4=0,Display_5=0,Display_6=0,Stock_Total=0,Timestamp=datetime.now().timestamp(),EntryId=None,Location='///',ListQty=0.0,Image='',CHKSTND_SPLY=0,WD_DSPLY=0,FLRL_CHP_DSPLY=0,FLRL_WTR_DSPLY=0,SBX_WTR_KLR=0,SBX_CHP_DSPLY=0,SBX_WTR_DSPLY=0,Facings=0,Tags='',CaseID_6W='',CaseID_BR='',CaseID_LD='',ALT_Barcode='',DUP_Barcode='',DayLogDate=datetime.now(),DayLogId=None,CRV=0.0,Tax=0.0,TaxNote='',userUpdated=False,LoadCount=1,PalletCount=1,ShelfCount=1,Description='',Distress=0,UnitsDeep=1,UnitsHigh=1,AquisitionDate=datetime(1,1,1),BestBy=datetime(1,1,1),Expiry=datetime(1,1,1)):
         if EntryId:
             self.EntryId=EntryId
         self.AquisitionDate=AquisitionDate
@@ -2239,6 +2269,18 @@ class DayLog(BASE,EntryExtras):
         self.Image=Image
         self.Tags=Tags
         self.Facings=Facings
+        if Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        else:
+            self.Expiry=Expiry
+        if BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        else:
+            self.BestBy=BestBy
+        if AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
+        else:
+            self.AquisitionDate=AquisitionDate
 
 
         self.ALT_Barcode=ALT_Barcode
@@ -2457,6 +2499,12 @@ class DayLog(BASE,EntryExtras):
         return result
 
     def saveListExtended(self,num):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         if self.LCL_ANDROID.exists():
             self.LCL=self.LCL_ANDROID
         total=self.Display_1+self.Display_2+self.Display_3+self.Display_4+self.Display_5+self.Display_6+self.Shelf+self.BackRoom
@@ -2501,9 +2549,9 @@ CHKSTND_SPLY={self.CHKSTND_SPLY}
 Total = {total}
 Distressed={self.Distress} #not included in total
 Total(w/o BR+) - Backroom = {(total-self.BackRoom)-self.BackRoom}
-Expiry = {self.Expiry}
-BestBy = {self.BestBy}
-AquisitionDate = {self.AquisitionDate}
+Expiry = {self.Expiry}[{self.Expiry-datetime.now()} old]
+BestBy = {self.BestBy}[{self.BestBy-datetime.now()} old]
+AquisitionDate = {self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]
 -------------{num}-------------
 """
         
@@ -2523,6 +2571,12 @@ Facings={self.Facings}
         '''
 
     def listdisplay_extended(self,num):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         #print(self.csv_headers())
         #print(self.csv_values())
         total=self.Display_1+self.Display_2+self.Display_3+self.Display_4+self.Display_5+self.Display_6+self.Shelf+self.BackRoom
@@ -2580,9 +2634,9 @@ Facings={self.Facings}
 deducted from Total as remainder is to be filled from LOAD{Style.reset}
 {Fore.cyan}{Style.bold}2->{Style.reset}{Fore.hot_pink_2}Total(w/o BR+) - Backroom{Style.reset} = {Fore.light_yellow}{(total-self.BackRoom)-self.BackRoom}{Style.reset}
 ------------- Dates ------------------
-{Fore.light_cyan}Expiry = {Fore.light_green}{self.Expiry}{Style.reset}
-{Fore.light_cyan}BestBy = {Fore.light_green}{self.BestBy}{Style.reset}
-{Fore.light_cyan}AquisitionDate = {Fore.light_green}{self.AquisitionDate}{Style.reset}
+{Fore.light_cyan}Expiry = {Fore.light_green}{self.Expiry}[{self.Expiry-datetime.now()} old]{Style.reset}
+{Fore.light_cyan}BestBy = {Fore.light_green}{self.BestBy}[{self.BestBy-datetime.now()} old]{Style.reset}
+{Fore.light_cyan}AquisitionDate = {Fore.light_green}{self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]{Style.reset}
 -------------{Style.bold+Style.underline+Fore.orange_red_1}{num}{Style.reset}-------------
 """
         print(msg)
@@ -2608,6 +2662,12 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
             return ''
 
     def __repr__(self):
+        if self.Expiry is None:
+            self.Expiry=datetime(1,1,1)
+        if self.BestBy is None:
+            self.BestBy=datetime(1,1,1)
+        if self.AquisitionDate is None:
+            self.AquisitionDate=datetime(1,1,1)
         types={i.name:str(i.type) for i in self.__table__.columns}
         m= f"""
         {Style.bold}{Style.underline}{Fore.pale_green_1b}Daylog{Style.reset}(
@@ -2667,9 +2727,9 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
         {Fore.light_steel_blue}PalletCount{Style.reset}:{Fore.grey_70}{types['PalletCount']}{Style.reset}={self.PalletCount},
         {Fore.light_steel_blue}LoadCount{Style.reset}:{Fore.grey_70}{types['LoadCount']}{Style.reset}={self.LoadCount},
         ------------- Dates ---------------
-        {Fore.light_cyan}Expiry{Fore.grey_70}[{types['Expiry']}] = {Fore.light_green}{self.Expiry}{Style.reset}
-        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}] = {Fore.light_green}{self.BestBy}{Style.reset}
-        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}] = {Fore.light_green}{self.AquisitionDate}{Style.reset}
+        {Fore.light_cyan}Expiry{Fore.grey_70}[{types['Expiry']}] = {Fore.light_green}{self.Expiry}[{self.Expiry-datetime.now()} old]{Style.reset}
+        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}] = {Fore.light_green}{self.BestBy}[{self.BestBy-datetime.now()} old]{Style.reset}
+        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}] = {Fore.light_green}{self.AquisitionDate}[{self.AquisitionDate-datetime.now()} old]{Style.reset}
 
         {Fore.sky_blue_2}Size{Style.reset}:{Fore.grey_70}{types['Size']}{Style.reset}={self.Size}
         {Fore.tan}Image[{Fore.dark_goldenrod}Exists:{Fore.deep_pink_3b}{self.imageExists()}{Style.reset}{Fore.tan}]{Style.reset}:{Fore.grey_70}{types['Image']}{Style.reset}={self.Image}
@@ -5017,10 +5077,10 @@ class HistoryUi:
                             else:
                                 session.delete(results[which])
                                 session.commit()
-                                session.flush()
                             self.cmd=None
                         except Exception as e:
                             print(e)
+                    session.flush()
 
 def saveHistory(cmd,ageLimit,executed,data):
     HistoryUi(init_only=True,noPrint=True).clean_old()
@@ -5029,7 +5089,6 @@ def saveHistory(cmd,ageLimit,executed,data):
         ph=PH(cmd=cmd,dtod=now+timedelta(seconds=ageLimit),ageLimit=ageLimit,executed=str(executed),data=str(data),dtoe=now)
         session.add(ph)
         session.commit()
-        session.refresh(ph)
 
 max_file_lines=detectGetOrSet("MAX_HFL",500)
 def logInput(text,max_hfl=None,maxed_hfl=True,user=True,filter_colors=False,ofile=None,clear_only=False):

radboy-0.0.829/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.829'

{radboy-0.0.827 → radboy-0.0.829}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.827
+Version: 0.0.829
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.827 → radboy-0.0.829}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.827"
+VERSION="0.0.829"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.827/STDOUT.TXT

@@ -1,7 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"backup"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.827"

radboy-0.0.827/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.827'