Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r1d3192e66bed27fb83cc86d4468bc5bdcc79647a -rfafc6e0cf130380ef845bd0519ef31049a3fbec4 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 1d3192e66bed27fb83cc86d4468bc5bdcc79647a) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision fafc6e0cf130380ef845bd0519ef31049a3fbec4) @@ -12,25 +12,19 @@ # ############################################################################ -import math + import squish import object -import sys import names import test -from dialin.common import MsgIds from configuration import config -from dialin.utils import * -from dialin.protocols import DenaliMessage, DenaliCanMessenger, DenaliChannels -from builtins import int as pyInt -from datetime import datetime def get_disinfect_bullet_object(id, screen_obj): """ - To obtain a bullet object based on occurrence provided. - @param screen_obj: provides the container on which the bullet must be present - @param num: provides the occurrence value + To set a custom object based on item from parameters + @param screen_obj (String): provides the custom container for the object + @param id (String): provides the custom id for the object @returns a real name object """ names.o_disinfect_dynamic_StepBullet["container"] = screen_obj @@ -41,7 +35,10 @@ def verify_page_step_indicator_for_disinfect(screen_obj, treatment_id, treatment_step, treatment_screens): """ Method to verify the Page Step indicators [the object on top of the screen which indicates the steps passed, current, remained] - @param treatment_step : indicates the Current treatment step + @param screen_obj (Dict) : Parent objject of page step indicator. + @param treatment_id (List) : disinfection id's for disinfection types. + @param treatment_step (Int) : indicates the Current treatment step. + @param treatment_screens(List): Type of disinfection. """ test.startSection("verification of page step indicators") for page in range(len(treatment_screens)): @@ -76,17 +73,12 @@ def get_disinfect_text_object(text, screen_obj): """ - To obtain a text object based on text provided - @param screen_obj: provides the container on which the txt must be present + To set a custom object based on item from parameters + @param screen_obj (String): provides the custom container for the object + @param text (String) : provides the custom text for the object @returns a real name object """ names.o_disinfect_dynamic_StepBullet_Text["container"] = screen_obj - names.o_disinfect_dynamic_StepBullet_Text["text"] = text + names.o_disinfect_dynamic_StepBullet_Text["text"] = text return names.o_disinfect_dynamic_StepBullet_Text - -def get_current_date_and_time(date_format='%Y/%b/%d - %H:%M'): - - date = datetime.now() - return str(date.strftime(date_format)) -