radboy 0.0.830__py3-none-any.whl → 0.0.831__py3-none-any.whl

radboy/DB/db.py

@@ -1856,6 +1856,20 @@ 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 not None:
+            expiry_age=self.Expiry-datetime.now()
+        else:
+            expiry_age=timedelta(days=0)
+        if self.BestBy is not None:
+            bestby_age=self.BestBy-datetime.now()
+        else:
+            bestby_age=timedelta(days=0)
+
+        if self.AquisitionDate is not None:
+            aqd_age=self.AquisitionDate-datetime.now()
+        else:
+            aqd_age=timedelta(days=0)
+
         pinfo=self.pinfo
         total_value=self.total_value(CaseMode=False)
         total_value_case=self.total_value()
@@ -1919,9 +1933,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}[{expiry_age} old]{Style.reset}
+        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}{Fore.light_cyan}]={Fore.light_green}{self.BestBy}[{bestby_age} old]{Style.reset}
+        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}{Fore.light_cyan}]={Fore.light_green}{self.AquisitionDate}[{aqd_age} 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}
@@ -2608,6 +2622,19 @@ deducted from Total as remainder is to be filled from LOAD{Style.reset}
             return ''
 
     def __repr__(self):
+        if self.Expiry is not None:
+            expiry_age=self.Expiry-datetime.now()
+        else:
+            expiry_age=timedelta(days=0)
+        if self.BestBy is not None:
+            bestby_age=self.BestBy-datetime.now()
+        else:
+            bestby_age=timedelta(days=0)
+
+        if self.AquisitionDate is not None:
+            aqd_age=self.AquisitionDate-datetime.now()
+        else:
+            aqd_age=timedelta(days=0)
         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 +2694,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}[{expiry_age} old]{Style.reset}
+        {Fore.light_cyan}BestBy{Fore.grey_70}[{types['BestBy']}] = {Fore.light_green}{self.BestBy}[{bestby_age} old]{Style.reset}
+        {Fore.light_cyan}AquisitionDate{Fore.grey_70}[{types['AquisitionDate']}] = {Fore.light_green}[{aqd_age} old]{self.AquisitionDate}{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}
@@ -4760,7 +4787,7 @@ class HistoryUi:
                     ALL_LINES=session.query(PH).all()
                     all_lines_ct=len(ALL_LINES)
 
-                    max_lines=detectGetOrSet('PH_MAXLINES',10000)
+                    max_lines=detectGetOrSet('PH_MAXLINES',1000)
                     if all_lines_ct >= max_lines:
                         for num,line in enumerate(reversed(ALL_LINES)):
                             if num <= max_lines:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.830'
+VERSION='0.0.831'

{radboy-0.0.830.dist-info → radboy-0.0.831.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.830
+Version: 0.0.831
 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.830.dist-info → radboy-0.0.831.dist-info}/RECORD

@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=h30zoTqt-XLt_afDPlxMxBiKKwmKi3N-yAuldNCqXUo,41476
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=l9X2MzzNRH5Vjyi5p7OeLeTmXWbkyhz8X8gb7pLnrZk,17
+radboy/__init__.py,sha256=etHicDBF2t-60RzO-0nVQ9f2ni0pggreJkOWTYexOOE,17
 radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
 radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
@@ -96,7 +96,7 @@ radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,
 radboy/DB/__init__.py,sha256=JiigA9B7GalP7YuRdcwyGDu5PDSBahoi0lLjtScxlN8,49
 radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,9285
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
-radboy/DB/db.py,sha256=vXy1lPXebP-jjP2FJyjXIlKSCoaFxcB89zNHzyBux8M,268306
+radboy/DB/db.py,sha256=cDzPO1fcdfTHmTIphOTkJLw9jDHzeFl6UyF1H3qMJIM,269276
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/jobnotes.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/DB/lsToday.py,sha256=Pevus6GBHLM2xudBEx8u36Q-jYvatOI-y5o72BmFnzA,9435
@@ -138,7 +138,7 @@ radboy/DB/__pycache__/config.cpython-312.pyc,sha256=Qo7E6MHrF6yqvKgepNFyCoekZXiv
 radboy/DB/__pycache__/config.cpython-313.pyc,sha256=_8wCIg_3jhyJjxnExD2Sm6aY-uZTw036p7Ki5znL7dc,376
 radboy/DB/__pycache__/db.cpython-311.pyc,sha256=rNgigyBd0D-cg1JxKAS8t0B_k0IEJivgVlRaZE10Xis,210105
 radboy/DB/__pycache__/db.cpython-312.pyc,sha256=ANDJPC0RoavbmSKFxG15vC7B4rEGyVt7xRJt7XGY3OA,334609
-radboy/DB/__pycache__/db.cpython-313.pyc,sha256=mz63_Tgm8PkP5orRTVapYWZr6G_Q7axOQSXTwRp3_tg,420348
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=n1ZN0c9T_q7lzJAxMNZ8cUjHxEzMe7xZ-ueRvgeWGQU,421839
 radboy/DB/__pycache__/glossary_db.cpython-312.pyc,sha256=8UL-29cKqtKovx0BANm6kzKKteef1BW_2qF3wumzst4,36023
 radboy/DB/__pycache__/glossary_db.cpython-313.pyc,sha256=Ke9bkvllGv5CK0JdT9DRvQ3MOdrXxoYv7TVLNkqLux0,36582
 radboy/DB/__pycache__/masterLookup.cpython-312.pyc,sha256=bQiOkmMwwHgcO18tYSWGQ-YUff4GQlKVhBMp1GoWAqY,6324
@@ -414,7 +414,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
 radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
 radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
 radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
-radboy/__pycache__/__init__.cpython-313.pyc,sha256=KfDI7AE4gTL9vwO8l5lmCovvAtFOSk7uZzMPAr6OZOw,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=he48rtZrhLFLjEI1xapTmP06KbdyJHWFBFfdROaBPvQ,165
 radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
 radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
 radboy/__pycache__/possibleCode.cpython-312.pyc,sha256=tk_CO-AcsO3YZj5j6vEsw3g37UmEzWc5YgeWEoJEUg4,27922
@@ -442,7 +442,7 @@ radboy/tkGui/Images/__pycache__/__init__.cpython-311.pyc,sha256=tXBYpqbOlZ24B1BI
 radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
 radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
 radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
-radboy-0.0.830.dist-info/METADATA,sha256=FLTOhvxNBI5Y4x3RJOZrWr9fnJTkEZ2ojLyV-9TRLD0,1920
-radboy-0.0.830.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.830.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.830.dist-info/RECORD,,
+radboy-0.0.831.dist-info/METADATA,sha256=iEXMvXKEzj3q6Mtjh21h3L4Niqr9jJw1nJC8nJZqWKI,1920
+radboy-0.0.831.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.831.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.831.dist-info/RECORD,,