Index: shared/scripts/names.py =================================================================== diff -u -rfafc6e0cf130380ef845bd0519ef31049a3fbec4 -ra53831cea0eb42896e18bba5fd32e47c667e4c61 --- shared/scripts/names.py (.../names.py) (revision fafc6e0cf130380ef845bd0519ef31049a3fbec4) +++ shared/scripts/names.py (.../names.py) (revision a53831cea0eb42896e18bba5fd32e47c667e4c61) @@ -49,71 +49,54 @@ o_MainHome_Create_Treatment_Button = {"container": o_MainHome_MainHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1, "visible": True} - +##Below set of objects are belongs to Disinfection-it is the combination of Heat,Flush and chemical disinfection. +#Disinfection o_DisinfectStack_DisinfectStack = {"container": o_Gui_MainView, "objectName": "_DisinfectStack", "type": "DisinfectStack", "visible": True} o_DisinfectStack_disinfectHome_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectHome", "type": "TreatmentFlowBase", "visible": True} o_disinfectHome_TouchRect = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "type": "TouchRect", "unnamed": 1, "visible": True} o_disinfectHome_swipeview_SwipeView = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_swipeview_Disinfection1_Text = {"container": o_disinfectHome_swipeview_SwipeView, "text": "Disinfection1", "type": "Text", "unnamed": 1, "visible": True} o_swipeview_Disinfection2_Text = {"container": o_disinfectHome_swipeview_SwipeView, "text": "Disinfection2", "type": "Text", "unnamed": 1, "visible": True} o_swipeview_Repeater = {"container": o_disinfectHome_swipeview_SwipeView, "index": 0, "type": "Repeater", "unnamed": 1, "visible": True} -o_swipeview_Item = {"container": o_disinfectHome_swipeview_SwipeView, "index": 0, "occurrence": 3, "type": "Item", "unnamed": 1, "visible": True} +#Chemical-Disinfect o_disinfectHome_Chemical_Disinfect = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "text": "Chemical Disinfect", "type": "Text", "unnamed": 1, "visible": True} o_DisinfectStack_disinfectChemical_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectChemical", "type": "TreatmentFlowBase", "visible": True} o_disinfectChemical_Chemical_Disinfect_Text = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "occurrence": 2, "text": "Chemical Disinfect", "type": "Text", "unnamed": 1, "visible": True} o_disinfectChemical_rightImage_Image = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_disinfectChemical_leftImage_Image = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_disinfectChemical_Chemical_Disinfect_Text_2 = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "text": "Chemical Disinfect", "type": "Text", "unnamed": 1, "visible": True} o_disinfectChemical_Disinfection_Text = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "text": "Disinfection", "type": "Text", "unnamed": 1, "visible": True} - o_disinfectChemical_gridStepsRest_Grid = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_gridStepsRest", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True} o_disinfectChemical_gridStepsRest_Grid_2 = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_gridStepsRest", "occurrence": 3, "type": "Grid", "unnamed": 1, "visible": True} -# = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_tailStepsRepeater", "occurrence": 2, "type": "Repeater", "unnamed": 1, "visible": True} o_disinfectChemical_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectChemical_gridSteps_Grid = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True} o_disinfectChemical_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} o_disinfectChemical_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} -#o_disinfectHeat_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} -#o_disinfectFlush_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} - - - - o_disinfectChemical_back_navigation = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_disinfectHome_Heat_Disinfect = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "text": "Heat Disinfect", "type": "Text", "unnamed": 1, "visible": True} o_DisinfectStack_disinfectHeat_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectHeat", "type": "TreatmentFlowBase", "visible": True} +#Disinfection-bullet verification o_disinfect_dynamic_StepBullet = {"type": "StepBullet", "unnamed": 1, "visible": True} o_disinfect_dynamic_StepBullet_Text = {"type": "Text", "unnamed": 1, "visible": True} - - -o_DisinfectStack_disinfectFlush_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectFlush", "type": "TreatmentFlowBase", "visible": True} +#Heat-Disinfection o_disinfectHeat_Heat_Disinfect_Text = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "occurrence": 2, "text": "Heat Disinfect", "type": "Text", "unnamed": 1, "visible": True} o_disinfectHeat_nextStepsBullet_StepBullet = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} - - - - o_disinfectHeat_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "id": "_headStepBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectHeat_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} - o_disinfectHeat_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} o_disinfectHeat_backButton_BackButton = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} - - - +#Flush-Disinfection +o_DisinfectStack_disinfectFlush_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectFlush", "type": "TreatmentFlowBase", "visible": True} o_disinfectFlush_Water_Flush_Text = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "occurrence": 2, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} o_disinfectFlush_nextStepsBullet_StepBullet = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectFlush_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "id": "_headStepBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectFlush_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} o_disinfectFlush_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} - - +#Home-Disinfection o_MainHome_NotificationBar_NotificationBar = {"container": o_MainHome_MainHome, "objectName": "NotificationBar", "type": "NotificationBar", "visible": False} o_disinfectHome_gridSteps_Grid = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True} o_disinfectHome_leftImage_Image = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_disinfectHome_rightImage_Image = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_disinfectHome_Disinfection_Text = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "occurrence": 2, "text": "Disinfection", "type": "Text", "unnamed": 1, "visible": True} - -