Rename and reorder several service keywords

@@ -48,11 +48,11 @@ Login
     Login
     Login
 
 
     ${start_date}=    Get From Dictionary  ${ARGUMENTS[1].data.tenderPeriod}   startDate
     ${start_date}=    Get From Dictionary  ${ARGUMENTS[1].data.tenderPeriod}   startDate
-    ${start_date}=   convert_date_to_prom_format   ${start_date}
+    ${start_date}=   convert_datetime_to_dot_format  ${start_date}
     ${end_date}=      Get From Dictionary  ${ARGUMENTS[1].data.tenderPeriod}   endDate
     ${end_date}=      Get From Dictionary  ${ARGUMENTS[1].data.tenderPeriod}   endDate
-    ${end_date}=   convert_date_to_prom_format   ${end_date}
+    ${end_date}=   convert_datetime_to_dot_format  ${end_date}
     ${enquiry_end_date}=      Get From Dictionary  ${ARGUMENTS[1].data.enquiryPeriod}   endDate
     ${enquiry_end_date}=      Get From Dictionary  ${ARGUMENTS[1].data.enquiryPeriod}   endDate
-    ${enquiry_end_date}=   convert_date_to_prom_format   ${enquiry_end_date}
+    ${enquiry_end_date}=   convert_datetime_to_dot_format  ${enquiry_end_date}
 
 
     ${items}=  Get From Dictionary    ${ARGUMENTS[1].data}   items
     ${items}=  Get From Dictionary    ${ARGUMENTS[1].data}   items
     ${delivery_date}=  Get From Dictionary    ${items[0].deliveryDate}   endDate
     ${delivery_date}=  Get From Dictionary    ${items[0].deliveryDate}   endDate

@@ -39,7 +39,7 @@ ${telephone}     +380976535447
   ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
   ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
   ${countryName}=   Get From Dictionary   ${prepared_tender_data.data.procuringEntity.address}       countryName
   ${countryName}=   Get From Dictionary   ${prepared_tender_data.data.procuringEntity.address}       countryName
   ${delivery_end_date}=      Get From Dictionary   ${items[0].deliveryDate}   endDate
   ${delivery_end_date}=      Get From Dictionary   ${items[0].deliveryDate}   endDate
-  ${delivery_end_date}=      convert_date_to_prom_format   ${delivery_end_date}
+  ${delivery_end_date}=      convert_datetime_to_dot_format  ${delivery_end_date}
   ${cpv}=           Convert To String     "Картонки"
   ${cpv}=           Convert To String     "Картонки"
   ${cpv_id}=           Get From Dictionary   ${items[0].classification}         id
   ${cpv_id}=           Get From Dictionary   ${items[0].classification}         id
   ${cpv_id_1}=           Get Substring    ${cpv_id}   0   3
   ${cpv_id_1}=           Get Substring    ${cpv_id}   0   3

@@ -98,12 +98,6 @@ def log_object_data(data, file_name=None, format="yaml"):
             file_obj.write(data)
             file_obj.write(data)
 
 
 
 
-def convert_date_to_prom_format(isodate):
-    iso_dt = parse_date(isodate)
-    day_string = iso_dt.strftime("%d.%m.%Y %H:%M")
-    return day_string
-
-
 def load_initial_data_from(file_name):
 def load_initial_data_from(file_name):
     if not os.path.exists(file_name):
     if not os.path.exists(file_name):
         file_name = os.path.join(os.path.dirname(__file__), 'data/{}'.format(file_name))
         file_name = os.path.join(os.path.dirname(__file__), 'data/{}'.format(file_name))
@@ -184,23 +178,33 @@ def wait_to_date(date_stamp):
         return 0
         return 0
     return wait_seconds
     return wait_seconds
 
 
-##GUI Frontends common
-def convert_date_to_slash_format(isodate):
-    iso_dt=parse_date(isodate)
-    date_string = iso_dt.strftime("%d/%m/%Y")
-    return  date_string
 
 
-def Add_data_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
-    now = datetime.now() 
+##GUI Frontends common
+def add_data_for_gui_frontends(INITIAL_TENDER_DATA):
+    now = datetime.now()
     #INITIAL_TENDER_DATA.data.enquiryPeriod['startDate'] = (now + timedelta(minutes=2)).isoformat()
     #INITIAL_TENDER_DATA.data.enquiryPeriod['startDate'] = (now + timedelta(minutes=2)).isoformat()
     INITIAL_TENDER_DATA.data.enquiryPeriod['endDate'] = (now + timedelta(minutes=6)).isoformat()
     INITIAL_TENDER_DATA.data.enquiryPeriod['endDate'] = (now + timedelta(minutes=6)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['startDate'] = (now + timedelta(minutes=7)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['startDate'] = (now + timedelta(minutes=7)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['endDate'] = (now + timedelta(minutes=11)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['endDate'] = (now + timedelta(minutes=11)).isoformat()
     return INITIAL_TENDER_DATA
     return INITIAL_TENDER_DATA
 
 
+
+def convert_date_to_slash_format(isodate):
+    iso_dt = parse_date(isodate)
+    date_string = iso_dt.strftime("%d/%m/%Y")
+    return date_string
+
+
+def convert_datetime_to_dot_format(isodate):
+    iso_dt = parse_date(isodate)
+    day_string = iso_dt.strftime("%d.%m.%Y %H:%M")
+    return day_string
+
+
 def local_path_to_file(file_name):
 def local_path_to_file(file_name):
     return os.path.join(os.path.dirname(__file__), 'documents', file_name)
     return os.path.join(os.path.dirname(__file__), 'documents', file_name)
 
 
+
 ## E-Tender
 ## E-Tender
 def convert_date_to_etender_format(isodate):
 def convert_date_to_etender_format(isodate):
     iso_dt=parse_date(isodate)
     iso_dt=parse_date(isodate)