radboy 0.0.614__tar.gz → 0.0.616__tar.gz

{radboy-0.0.614 → radboy-0.0.616}/PKG-INFO

@@ -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.616/STDOUT.TXT

@@ -0,0 +1,8 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"oar"
+#USER INPUT# -> :""
+#USER INPUT# -> :"4"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.616"

{radboy-0.0.614 → radboy-0.0.616}/pyproject.toml

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

{radboy-0.0.614 → radboy-0.0.616}/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-0.0.614 → radboy-0.0.616}/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-0.0.614 → radboy-0.0.616}/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-0.0.616/radboy/__init__.py

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

{radboy-0.0.614 → radboy-0.0.616}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.616}/setup.py

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

radboy-0.0.614/STDOUT.TXT

@@ -1,20 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"fcmd"
-#USER INPUT# -> :"oar"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"5"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"showkeys"
-#USER INPUT# -> :""
-#USER INPUT# -> :"gotoi"
-#USER INPUT# -> :"68"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"-1"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.614"

radboy-0.0.614/radboy/__init__.py

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