radboy 0.0.614__py3-none-any.whl → 0.0.616__py3-none-any.whl

radboy/DB/OrderedAndRxd.py

@@ -2,6 +2,7 @@ from radboy.DB.db import *
 from radboy.FB.FormBuilder import FormBuilder
 from copy import deepcopy as copy
 from radboy.ExportUtility import *
+import radboy.HealthLog as HL
 def CountTo():
     fd={
         'Start':{
@@ -497,14 +498,23 @@ class OrderAndRxdUi():
             raise Exception(f"Not a registered as_('{as_}')")
         if fields is not None:
             fd=FormBuilder(data=fields)
+            if fd is None:
+                print("User Cancelled! OrderedAndRecieved_as(self,_exlcudes=[],as_=None,item=None)")
+                return
             return fd,fields
 
     def search(self,selector=False,menu=False):
-        terms,z=self.OrderedAndRecieved_as(as_=None)
+        nantucket=self.OrderedAndRecieved_as(as_=None)
+        if nantucket is None:
+            print("User cancelled! search(self,selector=False,menu=False)")
+            return
+        terms,z=nantucket
         terms=self.filter(terms)
         def selectortext(results,page=False,self=self):
             def edit(i,self=self):
                 edits=self.OrderedAndRecieved_as(as_="from_item",item=i)
+                if edits is None:
+                    return
                 with Session(ENGINE) as session:
                     e=session.query(OrderedAndRecieved).filter(OrderedAndRecieved.oarid==i.oarid).first()
                     if e is not None:
@@ -525,6 +535,7 @@ class OrderAndRxdUi():
                     while not ready:
                         menu=Control(func=FormBuilderMkText,ptext="edit/e or r/rm/del/delete/dlt",helpText="edit or delete",data="string")
                         if menu is None:
+                            ready=True
                             continue
                         elif menu in ['d',]:
                             print(std_colorize(i,num,ct))
@@ -595,6 +606,11 @@ class OrderAndRxdUi():
             'desc':'drop and recreate table',
             'exec':lambda self=self:self.fixtable()
         }
+        self.cmds[uuid1()]={
+            'cmds':generate_cmds(startcmd=['health','h',],endCmd=['log', 'l',]),
+            'desc':'healthlog',
+            'exec':lambda self=self:HL.HealthLog.HealthLogUi()
+        }
         self.cmds["ExportTables"]={
         'cmds':["export tables","xpttbl",],
         'desc':f'import/export selected tables to/from selected XLSX (Excel)/ODF',

radboy/ExportUtility/ExportTableClass.py

@@ -223,6 +223,72 @@ class ExportTable:
 				#print(key,dictionary,dictionary[key],rep,alt.encode())
 		return dictionary
 
+	def import_x_from_excel(self):
+		print("Not Yet Ready")
+		return
+		import_file=Control(func=FormBuilderMkText,ptext="Filename: ",helpText="file to import from",data="string")
+		if import_file is None:
+			return
+		if not Path(import_file).exists():
+			print(f"file: {import_file} does not exist!")
+			return
+
+		try:
+			dtype={
+			}
+			df=pd.read_excel(import_file,dtype=dtype)
+			if len(df) < 2:
+				print("There is nothing to import")
+				return
+			with Session(ENGINE) as session:
+				for row in df.itertuples():
+					skip=False
+					entryRow=row._asdict()
+			classes=[i for i in BASE.registry.metadata.tables.keys()]
+			htext=[]
+			ct=len(classes)
+			for num,i in enumerate(classes):
+				htext.append(std_colorize(i,num,ct))
+			htext='\n'.join(htext)
+			print(htext)
+			import_as=Control(func=FormBuilderMkText,ptext="import as index:",helpText=htext,data="integer")
+			if import_as is None:
+				return
+			elif import_as in ['d','']:
+				return
+			if import_as in [i for i in range(0,ct)]:
+				CLASS=BASE.metadata.tables.get(classes[import_as])
+
+			with Session(ENGINE) as session:
+				for row in df.itertuples():
+					skip=False
+					entryRow=row._asdict()
+					try:
+						if import_as in [i for i in range(0,ct)]:
+							CLASS=BASE.metadata.tables.get(classes[import_as])
+							#i need the class for the table
+							entry=CLASS
+						else:
+							return
+						
+						for k in entryRow:
+							print(row)
+							entryRow[k]=self.alterDictionary(entryRow,k)[k]
+							if k in excludes:
+								continue
+							try:
+								setattr(entry,k,entryRow[k])
+							except Exception as ee:
+								print(ee)
+					except Exception as e:
+						print(e)
+					session.add(entry)
+					session.commit()
+			'''get classes'''
+		except Exception as e:
+			print(e)
+
+
 	def importExcel(self,update=False,duplicates=False,manual=False,ods=False):
 		import_file=self.importFile()
 		if ods:
@@ -368,6 +434,11 @@ enter goes to next entry row'''
 				'exec':self.lsTables,
 				'desc':'list tables in db',
 			},
+			f'{uuid1()}':{
+				'cmds':['import x from excel','ixfe'],
+				'exec':self.import_x_from_excel,
+				'desc':'import a class x from excel',
+			},
 			'export selected':{
 				'cmds':['export selected table','est','xpt slct tbl'],
 				'exec':self.exportSelected,
@@ -388,27 +459,27 @@ enter goes to next entry row'''
 			'exec':self.exportSelectedDaylogEntry,
 			'desc':'Export a specific DayLog Entry Set by search'
 			},
-			'import from excel no duplicates no update':{
+			'import Entry from excel no duplicates no update':{
 			'cmds':['ife_0d_0u','import from excel no duplicates no update'],
 			'exec':self.importExcel,
 			'desc':'import from excel no duplicates no update'
 			},
-			'import from excel yes duplicates yes update update':{
+			'import Entry from excel yes duplicates yes update update':{
 			'cmds':['ife_1d_1u','import from excel yes duplicates yes update'],
 			'exec':lambda self=self:self.importExcel(update=True,duplicates=True),
 			'desc':'import from excel no duplicates yes update'
 			},
-			'import from excel yes duplicates no update':{
+			'import Entry from excel yes duplicates no update':{
 			'cmds':['ife_1d_0u','import from excel yes duplicates no update'],
 			'exec':lambda self=self:self.importExcel(update=False,duplicates=True),
 			'desc':'import from excel yes duplicates no update'
 			},
-			'import from excel with manual Intevention':{
+			'import Entry from excel with manual Intevention':{
 			'cmds':['ifem','import from excel manual Intevention'],
 			'exec':lambda self=self:self.importExcel(manual=True,duplicates=True),
 			'desc':'import from excel with manual Intevention'
 			},
-			'export excel template':{
+			'export Entry excel template':{
 			'cmds':['export excel template','eet'],
 			'exec':self.exportTemplateExcel,
 			'desc':'export a blank template file'

radboy/HealthLog/HealthLog.py

@@ -27,6 +27,7 @@ import pint_pandas
 import radboy.DB.ExerciseTracker as ET
 import zipfile
 from copy import copy
+from radboy.DB.OrderedAndRxd import *
 
 class HealthLogUi:
 	def edit_hlid(self):
@@ -917,6 +918,11 @@ class HealthLogUi:
 			'desc':'export data for diabete\'s dr.',
 			'exec':lambda self=self:self.export_log_field(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
 			},
+			str(uuid1()):{
+			'cmds':['ordered and recieved','oar','ordered and rxd','ordered & rxd','ordered & recieved','o&r'],
+			'desc':'ordered and recieved journal',
+			'exec':lambda self=self:OrderAndRxdUi()
+			},
 			'xpt consumed':{
 				'cmds':['xptfd','xpt fd','xpt food','xpt-fd','xpt fuel','xpt fl','xlfl'],
 				'desc':'export food',

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.614'
+VERSION='0.0.616'

{radboy-0.0.614.dist-info → radboy-0.0.616.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.614
+Version: 0.0.616
 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.614.dist-info → radboy-0.0.616.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=0Kqa_tk0Yv0EjXIolvpbPQa4pVGQxpQYyKz3SFobq8k,17
+radboy/__init__.py,sha256=OMXBHigtSW5gtZVn0EG5ZRyuYJgMEnaECVINkuTKg8I,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
@@ -83,7 +83,7 @@ radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
 radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
-radboy/DB/OrderedAndRxd.py,sha256=yBkpGG2AeDp5kT6gI36R10ptDfTgYI30_w-vNy2xKaA,28470
+radboy/DB/OrderedAndRxd.py,sha256=1nitI8graVGGWIi6lTMYIXJQY5b7H1C9vzqgeoMVsN8,29119
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -172,10 +172,10 @@ radboy/ExportList/__pycache__/ExportListCurrent.cpython-313.pyc,sha256=dzQW8WMGX
 radboy/ExportList/__pycache__/__init__.cpython-311.pyc,sha256=Un4CG_te_VMBqYQel5c4jsw4sHe_LYZWSaXx_vVJL9w,235
 radboy/ExportList/__pycache__/__init__.cpython-312.pyc,sha256=NdzphL0FHS2zypVi1pG6SoNpv3v3ZynIN2WSl0VMnd8,273
 radboy/ExportList/__pycache__/__init__.cpython-313.pyc,sha256=xitjWDqLahSMr4qux3sM0AyU-LZF_5XYDKruBvnPr8I,152
-radboy/ExportUtility/ExportTableClass.py,sha256=QdHeu0j9IzgH6qDUjdZrPAki2s1nMax_PVs405MjzOc,16739
+radboy/ExportUtility/ExportTableClass.py,sha256=6t3dXSlvnOhvNTSQmLg1OjjoYmgXwp3X5YvpzyXBpl0,18670
 radboy/ExportUtility/__init__.py,sha256=cybpF7RcHJkB2V6Fc37B5X2LLUfCtlveVpz8P4nRmo4,902
 radboy/ExportUtility/__pycache__/ExportTableClass.cpython-312.pyc,sha256=R3crrAJq1SZHaIEskRkNfm1kQ4akcfw8cXK0A8SQcZ8,30267
-radboy/ExportUtility/__pycache__/ExportTableClass.cpython-313.pyc,sha256=Rf1gsH_b5b6wClMjbNuY2kDkmo4j8ndC-vaRpLpwAgk,31740
+radboy/ExportUtility/__pycache__/ExportTableClass.cpython-313.pyc,sha256=pHd-xqL0aL_85A1_R-mlyCP669LI2OaTfwe9F2j5Z6A,32743
 radboy/ExportUtility/__pycache__/__init__.cpython-312.pyc,sha256=acMdux6Y869oA-gpjY0Fem97iQwq9BAGNrW7AEzUnTI,1308
 radboy/ExportUtility/__pycache__/__init__.cpython-313.pyc,sha256=DrB-8MZCIcENUju5eBxf1tT9Gu5h71rwfayzgm7wx3M,1308
 radboy/ExtraTools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -213,10 +213,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=2RQxuqSV_fRPohAd5A2UenKwElpJ19XyWbnVl-mkZOg,37513
+radboy/HealthLog/HealthLog.py,sha256=kab1O3Pb_gwwCXzEHPUetq99cR-nf0ueSISqjL29Z4Y,37763
 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=Y8zL1bsKODV08MB265tVDQ0hfc1ZB2cr0dCcf7PKO0M,58477
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=OQ-NlyGzqyvleIjFdnm-lVEmIoM0B0nXDVV9gD_7EUE,58838
 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
@@ -401,7 +401,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=ijmJcnTrIK74HVs6HFHFIcFnNBjGdbV8Faz-1IRAdZM,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=aNWL45MlMPGmI8aDzZesoqL_dNAsG6UZHiVZaKedrow,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
@@ -429,7 +429,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.614.dist-info/METADATA,sha256=7vco8NmsuaZS1mjakAHsV9t3rPHBfihh-Jp--9dRnJU,1662
-radboy-0.0.614.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.614.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.614.dist-info/RECORD,,
+radboy-0.0.616.dist-info/METADATA,sha256=6fh6pbwNEpp1hxcMO1hP7tyzA-HJOJMadzVSOljmkN0,1662
+radboy-0.0.616.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.616.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.616.dist-info/RECORD,,