Split service_keywords.py (E-tender)

@@ -2,6 +2,7 @@
 Library  Selenium2Screenshots
 Library  Selenium2Screenshots
 Library  String
 Library  String
 Library  DateTime
 Library  DateTime
+Library  etender_service.py
 
 
 *** Variables ***
 *** Variables ***
 ${locator.tenderId}                                            jquery=h3
 ${locator.tenderId}                                            jquery=h3
@@ -63,8 +64,8 @@ Login
   [Documentation]
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_data
   ...      ${ARGUMENTS[1]} ==  tender_data
-  ${INITIAL_TENDER_DATA}=  procuringEntity_name   ${INITIAL_TENDER_DATA}
-  ${tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
+  ${tender_data}=  Add_data_for_GUI_FrontEnds  ${ARGUMENTS[1]}
+  ${tender_data}=  procuring_entity_name  ${tender_data}
   ${items}=         Get From Dictionary   ${tender_data.data}               items
   ${items}=         Get From Dictionary   ${tender_data.data}               items
   ${title}=         Get From Dictionary   ${tender_data.data}               title
   ${title}=         Get From Dictionary   ${tender_data.data}               title
   ${description}=   Get From Dictionary   ${tender_data.data}               description
   ${description}=   Get From Dictionary   ${tender_data.data}               description

-from datetime import date, datetime, timedelta
-from dateutil.parser import parse
-from dateutil.tz import tzlocal
 from iso8601 import parse_date
 from iso8601 import parse_date
-from jsonpath_rw import parse as parse_path
-from pytz import timezone
-from robot.output import LOGGER
-from robot.output.loggerhelper import Message
-from robot.libraries.BuiltIn import BuiltIn
-from robot.errors import HandlerExecutionFailed
-from op_robot_tests.tests_files.initial_data import (
-    test_tender_data
-)
-import time
-
-TIMEZONE = timezone('Europe/Kiev')
 
 
 
 
 def convert_date_to_etender_format(isodate):
 def convert_date_to_etender_format(isodate):
@@ -22,7 +7,18 @@ def convert_date_to_etender_format(isodate):
     return date_string
     return date_string
 
 
 
 
+def convert_datetime_for_delivery(isodate):
+    iso_dt = parse_date(isodate)
+    date_string = iso_dt.strftime("%Y-%m-%d %H:%M")
+    return date_string
+
+
 def convert_time_to_etender_format(isodate):
 def convert_time_to_etender_format(isodate):
     iso_dt = parse_date(isodate)
     iso_dt = parse_date(isodate)
     time_string = iso_dt.strftime("%H:%M")
     time_string = iso_dt.strftime("%H:%M")
     return time_string
     return time_string
+
+
+def procuring_entity_name(INITIAL_TENDER_DATA):
+    INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"Повна назва невідомо чого"
+    return INITIAL_TENDER_DATA

@@ -203,24 +203,3 @@ def convert_datetime_to_dot_format(isodate):
 
 
 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
-def convert_date_to_etender_format(isodate):
-    iso_dt=parse_date(isodate)
-    date_string = iso_dt.strftime("%d-%m-%Y")
-    return  date_string
-
-def convert_date_for_delivery(isodate):
-    iso_dt=parse_date(isodate)
-    date_string = iso_dt.strftime("%Y-%m-%d %H:%M")
-    return  date_string
-
-def convert_time_to_etender_format(isodate):
-    iso_dt=parse_date(isodate)
-    time_string = iso_dt.strftime("%H:%M")
-    return  time_string
-
-def procuringEntity_name(INITIAL_TENDER_DATA):
-    INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"Повна назва невідомо чого"
-    return INITIAL_TENDER_DATA