radboy 0.0.574__py3-none-any.whl → 0.0.576__py3-none-any.whl

radboy/DB/db.py

@@ -202,6 +202,34 @@ def strip_colors(colored_text):
 
 class BOOLEAN_ANSWERS:
     def __init__(self):
+        self.valid_fields=['Shelf',
+        'BackRoom',
+        'Display_1',
+        'Display_2',
+        'Display_3',
+        'Display_4',
+        'Display_5',
+        'Display_6',
+        'ALT_Barcode',
+        'DUP_Barcode',
+        'CaseID_BR',
+        'CaseID_LD',
+        'CaseID_6W',
+        'Tags',
+        'Facings',
+        'SBX_WTR_DSPLY',
+        'SBX_CHP_DSPLY',
+        'SBX_WTR_KLR',
+        'FLRL_CHP_DSPLY',
+        'FLRL_WTR_DSPLY',
+        'WD_DSPLY',
+        'CHKSTND_SPLY',
+        'Distress',
+        'Facings',
+        'UnitsDeep',
+        'UnitsHigh',
+        'ListQty'
+        ]
         self.HealthLogZip=Path("HealthLog.zip")
         self.IllegalCharsManifest=Path("IllegalCharsManifest.txt")
         self.yes=generate_cmds(startcmd=['y','Y','YES','1','t','true','TRUE','True'],endCmd=['',' '])
@@ -544,6 +572,13 @@ LOCATION_FIELDS=[
 
 
 def dayString(today,plain=False):
+    if isinstance(today,str):
+        print(today)
+        today=datetime.now()
+    if not isinstance(today,datetime):
+        print(today,type(today))
+        today=datetime.now()
+
     ds=f'''{today.strftime(f"{Fore.light_yellow}%m/{Fore.light_red}%d/{Fore.light_sea_green}%Y {Fore.light_red}(%A, {Fore.grey_50}Week {(today.day - 1) // 7 + 1} of {Fore.light_yellow}%B{Fore.grey_50}, week %W of {Fore.light_sea_green}year %Y){Fore.light_cyan} @ {Fore.orange_red_1}%H/{Fore.light_cyan}24.Hr|({Fore.dark_goldenrod}%I/{Fore.light_cyan}12.Hr){Fore.light_green}:%M.Min{Fore.magenta}:%S.Sec ({Fore.dark_goldenrod}%p/{Fore.light_cyan}12.Hr)")}'''
     if plain:
         return strip_colors(ds)

radboy/HealthLog/HealthLog.py

@@ -269,12 +269,6 @@ class HealthLogUi:
 			print(e)
 
 	def export_log(self):
-		try:
-			with BooleanAnswers.IllegalCharsManifest.open("w") as output:
-				output.write("Below is a list of Characters replaced with a non-illegal equivalents.\n")
-				output.write("Replacement in Text = Character\n")
-		except Exception as e:
-			print(e)
 		useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
 		if useDateRange is None:
 			return
@@ -316,9 +310,13 @@ class HealthLogUi:
 
 			try:
 				for column in df:
-				    column_length = max(df[column].astype(str).map(len).max(), len(column))
-				    col_idx = df.columns.get_loc(column)
-				    output.sheets[sheetName].set_column(col_idx, col_idx, column_length)
+					column_length = 5+len(column)+5
+					col_idx = df.columns.get_loc(column)
+					output.sheets[sheetName].set_column(col_idx, col_idx, column_length)
+
+					col_idx = df.columns.get_loc('DTOE')
+					dtoe_length = max(df['DTOE'].astype(str).map(len).max(), len('DTOE'))
+					output.sheets[sheetName].set_column(col_idx, col_idx, dtoe_length)
 
 				
 				output.close()
@@ -328,19 +326,11 @@ class HealthLogUi:
 
 			with zipfile.ZipFile(BooleanAnswers.HealthLogZip,"w") as oz:
 				oz.write(output)
-				oz.write(BooleanAnswers.IllegalCharsManifest)
 			print(fil.absolute())
-			print(BooleanAnswers.IllegalCharsManifest.absolute())
 			print(f"{Fore.orange_red_1}The Below file only contains the above files!{Style.reset}")
 			print(BooleanAnswers.HealthLogZip.absolute())
 
 	def export_log_field(self,fields=[],not_none=[]):
-		try:
-			with BooleanAnswers.IllegalCharsManifest.open("w") as output:
-				output.write("Below is a list of Characters replaced with a non-illegal equivalents.\n")
-				output.write("Replacement in Text = Character\n")
-		except Exception as e:
-			print(e)
 		useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
 		if useDateRange is None:
 			return
@@ -387,10 +377,15 @@ class HealthLogUi:
 
 			try:
 				for column in df:
-				    column_length = max(df[column].astype(str).map(len).max(), len(column))
-				    col_idx = df.columns.get_loc(column)
-				    output.sheets[sheetName].set_column(col_idx, col_idx, column_length)
+					column_length = 5+len(column)+5
+					col_idx = df.columns.get_loc(column)
+					output.sheets[sheetName].set_column(col_idx, col_idx, column_length)
 
+					col_idx = df.columns.get_loc('DTOE')
+					dtoe_length = max(df['DTOE'].astype(str).map(len).max(), len('DTOE'))
+					output.sheets[sheetName].set_column(col_idx, col_idx, dtoe_length)
+
+					
 				
 				output.close()
 
@@ -398,9 +393,7 @@ class HealthLogUi:
 				print(e)
 			with zipfile.ZipFile(BooleanAnswers.HealthLogZip,"w") as oz:
 				oz.write(output)
-				oz.write(BooleanAnswers.IllegalCharsManifest)
 			print(fil.absolute())
-			print(BooleanAnswers.IllegalCharsManifest.absolute())
 			print(f"{Fore.orange_red_1}The Below file only contains the above files!{Style.reset}")
 			print(BooleanAnswers.HealthLogZip.absolute())
 
@@ -643,11 +636,11 @@ class HealthLogUi:
 								for x in fields:
 									includes=[
 											"CarboHydrateIntake",
-										    "ProtienIntake",
-										    "FiberIntake",
-										    "TotalFat",
-										    "SodiumIntake",
-										    "CholesterolIntake",
+											"ProtienIntake",
+											"FiberIntake",
+											"TotalFat",
+											"SodiumIntake",
+											"CholesterolIntake",
 											]
 									if x.name not in includes:
 										continue

radboy/TasksMode/Tasks.py

@@ -60,15 +60,24 @@ def totalDBItems():
     with Session(ENGINE) as session:
         total=0
         crv_items=0
+        crv_qty_items=0
         q=session.query(Entry).filter(Entry.InList==True)
         a=q.all()
 
         for i in a:
+            qty=0
+            
+            for f in BooleanAnswers.valid_fields:
+                value=getattr(i,f)
+                if value is not None:
+                    qty+=value
+
             if i.CRV not in [0,None]:
                 total+=1
                 crv_items+=1
+                crv_qty_items+=qty
             total+=1
-        return f"(TTL ITM:{Fore.light_red}{total}{Fore.light_yellow},CRV ITM :{Fore.light_red}{crv_items}{Fore.light_yellow})"
+        return f"List(TTL ITM:{Fore.light_red}{total}{Fore.light_yellow},CRV ITM :{Fore.light_red}{crv_items}{Fore.light_yellow},CRV QTY ITM :{Fore.light_red}{crv_qty_items}{Fore.light_yellow})"
 
 
 def check_back_ups():
@@ -4884,34 +4893,7 @@ where:
         self.parent=parent
         self.special=['Tags','ALT_Barcode','DUP_Barcode','CaseID_6W','CaseID_BR','CaseID_LD','Facings']
         self.locationFields=LOCATION_FIELDS
-        self.valid_fields=['Shelf',
-        'BackRoom',
-        'Display_1',
-        'Display_2',
-        'Display_3',
-        'Display_4',
-        'Display_5',
-        'Display_6',
-        'ALT_Barcode',
-        'DUP_Barcode',
-        'CaseID_BR',
-        'CaseID_LD',
-        'CaseID_6W',
-        'Tags',
-        'Facings',
-        'SBX_WTR_DSPLY',
-        'SBX_CHP_DSPLY',
-        'SBX_WTR_KLR',
-        'FLRL_CHP_DSPLY',
-        'FLRL_WTR_DSPLY',
-        'WD_DSPLY',
-        'CHKSTND_SPLY',
-        'Distress',
-        'Facings',
-        'UnitsDeep',
-        'UnitsHigh',
-        'ListQty'
-        ]
+        self.valid_fields=BooleanAnswers.valid_fields
         '''
         ALT_Barcode=Column(String)
         DUP_Barcode=Column(String)

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.574'
+VERSION='0.0.576'

{radboy-0.0.574.dist-info → radboy-0.0.576.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.574
+Version: 0.0.576
 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.574.dist-info → radboy-0.0.576.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=Sk4GDtczBQpX0Nn6TxpqkYs89wY7GAZKWPdBFtcJleE,17
+radboy/__init__.py,sha256=pYyQw5X7lyBL5z3E1a2LbPzrjj0Im3NbgUgFghEc5_8,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
@@ -93,7 +93,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=iwqnxc0woh0ZBit9Dk-WLzQNxCNLS8ja16U54db24u0,254926
+radboy/DB/db.py,sha256=aFVHvmEZ87wPN1YMMrFkZQ_IWrMttTEHWKKVV8e1lr8,255712
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -128,7 +128,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=k6GSe4i6OJc94p641GMVve4Su7oZLWbjDztnohxlTVQ,402888
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=-U76EDZ13_aRb-VKn3V7WSUxssTkazsX4dQuz__mGrM,403399
 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
@@ -211,10 +211,10 @@ radboy/GeoTools/__pycache__/GeoClass.cpython-313.pyc,sha256=eZ6hpLKoic1XCb7BKKg-
 radboy/GeoTools/__pycache__/OSMClass.cpython-312.pyc,sha256=5RoT8_wiI8R7yb_B9FWIC7mALdGNoqyWtkzsjM2pbh0,40387
 radboy/GeoTools/__pycache__/__init__.cpython-312.pyc,sha256=Y7Xtrzwm44-xuY_4NK8aDjYfVmXIzUFWOyexJu9le8A,1238
 radboy/GeoTools/__pycache__/__init__.cpython-313.pyc,sha256=-bk9eEIxWZgHYZHtNJbrpubDRWkbdYNkGr5J7sVhyIE,1238
-radboy/HealthLog/HealthLog.py,sha256=apAG2MBmrKsDBqrySGTrdtT7KQmTGigrnFz710pGQ7k,37539
+radboy/HealthLog/HealthLog.py,sha256=D-L1RjE3xLNQx0XgeISWzOwpXMBD7zAWdr7TDpKUhGM,37086
 radboy/HealthLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/HealthLog/__pycache__/HealthLog.cpython-312.pyc,sha256=hTo4o7jo9L2yqPZgzuKUw_kon_PVcCuTRguELTuLrIo,27946
-radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=zx8G-s0Jyy5Y2uQWy-f_6rkMbcl_WOQPPq5QaIM9uac,58881
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=im5mkOYoMf9V9CRbpb01_n0MEwI5kR4YbRJkAJV9qGk,58010
 radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
 radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
 radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
@@ -343,7 +343,7 @@ radboy/SystemSettings/__pycache__/__init__.cpython-312.pyc,sha256=aIzp4Po0t8EhSA
 radboy/SystemSettings/__pycache__/__init__.cpython-313.pyc,sha256=QFDuoidxMWsGVLsy5lN-rDs6TP8nKJ4yyCyiamNOhwo,156
 radboy/TasksMode/ReFormula.py,sha256=REDRJYub-OEOE6g14oRQOLOQwv8pHqVJy4NQk3CCM90,2255
 radboy/TasksMode/SetEntryNEU.py,sha256=Gu0Z677tjpc7-9AQtLbIr7yzPx6ZJXGK33lOIgU0IRM,17432
-radboy/TasksMode/Tasks.py,sha256=tSzAjarH7jIrrdlXiw5SuQpRINuBMg4ASGP0HZrwQ38,341665
+radboy/TasksMode/Tasks.py,sha256=LzKIYX8vWRMO0F75s1dUO3-Jkd0q9KkMGT_ytRwwXfs,341428
 radboy/TasksMode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/TasksMode/__pycache__/ReFormula.cpython-311.pyc,sha256=QEG3PwVw-8HTd_Mf9XbVcxU56F1fC9yBqWXYPLC39DU,4865
 radboy/TasksMode/__pycache__/ReFormula.cpython-312.pyc,sha256=aX7BWm2PPjCTnxsbGUitR-2h9hq4AjaBiHMrUXvIl0Y,3967
@@ -352,7 +352,7 @@ radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6Sv
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=UExwr8dN2STFEDE5t_YnQFMUX-wGv7JH10I1OyBDRtM,20212
 radboy/TasksMode/__pycache__/Tasks.cpython-311.pyc,sha256=6QOTJnLiXSKdF81hkhy3vyrz49PPhS20s5_0X52g3Hw,131120
 radboy/TasksMode/__pycache__/Tasks.cpython-312.pyc,sha256=hyJwdaYaaRLdcrNxgg36diJ5iijX5_3I0UAORsj-6LU,310295
-radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=A65bcUxQba9forVqkj9vX9y_0-RGuBec55KO-G8ktJs,414775
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=5lwejRXwe14yOOHqhjb6D397JT-l3zu7q5R_zTcmLzg,415054
 radboy/TasksMode/__pycache__/__init__.cpython-311.pyc,sha256=PKV1JbihEacm639b53bZozRQvcllSkjGP3q8STVMxF4,234
 radboy/TasksMode/__pycache__/__init__.cpython-312.pyc,sha256=ERgnEvRMiGSecWp1BpNzLdSq_SdKw7GvFWUvUM7bLVw,272
 radboy/TasksMode/__pycache__/__init__.cpython-313.pyc,sha256=lvsTxukyvGKB3C0rdF9dQi_bvVh6ceDVINfwcuIsd0s,151
@@ -399,7 +399,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=KVPDG6b63efWVCXilOoAVLzCPDfyHbv35TZHCMLUjKg,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=0bTdKVUPe3Eyn2mp_iOJ6z50Kmmg2XZXwr80gFk6jLU,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
@@ -427,7 +427,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.574.dist-info/METADATA,sha256=WR-65r-oEJQyjGeXPGJhDbgwQxNH8E5qbjJplQQ-Gqw,1662
-radboy-0.0.574.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.574.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.574.dist-info/RECORD,,
+radboy-0.0.576.dist-info/METADATA,sha256=OxcEg9zX-CTK7H7ZqgkT9r467mjpazbk7AXf8ijvqT0,1662
+radboy-0.0.576.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.576.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.576.dist-info/RECORD,,