Split service_keywords.py (Newtend)

@@ -2,6 +2,7 @@
 Library  Selenium2Screenshots
 Library  Selenium2Screenshots
 Library  String
 Library  String
 Library  DateTime
 Library  DateTime
+Library  newtend_service.py
 
 
 *** Variables ***
 *** Variables ***
 ${locator.title}                     xpath=//div[@ng-bind="tender.title"]
 ${locator.title}                     xpath=//div[@ng-bind="tender.title"]
@@ -66,7 +67,7 @@ Login
   [Documentation]
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  initial_tender_data
   ...      ${ARGUMENTS[1]} ==  initial_tender_data
-## Inicialisation
+## Initialisation
   #${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
   #${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
   ${INITIAL_TENDER_DATA}=  Add_data_for_GUI_FrontEnds  ${INITIAL_TENDER_DATA}
   ${INITIAL_TENDER_DATA}=  Add_data_for_GUI_FrontEnds  ${INITIAL_TENDER_DATA}
   ${INITIAL_TENDER_DATA}=  Update_data_for_Newtend  ${INITIAL_TENDER_DATA}
   ${INITIAL_TENDER_DATA}=  Update_data_for_Newtend  ${INITIAL_TENDER_DATA}

+from datetime import datetime
+from iso8601 import parse_date
+from calendar import monthrange
+
+
+def newtend_date_picker_index(isodate):
+    now = datetime.today()
+    date_str = '01' + str(now.month) + str(now.year)
+    first_day_of_month = datetime.strptime(date_str, "%d%m%Y")
+    mod = first_day_of_month.isoweekday() - 2
+    iso_dt = parse_date(isodate)
+    # last_day_of_month = monthrange(now.year, now.month)[1]
+    # LOGGER.log_message(Message("last_day_of_month: {}".format(last_day_of_month), "INFO"))
+    if now.day > iso_dt.day:
+        mod = monthrange(now.year, now.month)[1] + mod
+    return mod + iso_dt.day
+
+
+def update_data_for_newtend(INITIAL_TENDER_DATA):
+    INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"openprocurement"
+    return INITIAL_TENDER_DATA

@@ -18,7 +18,6 @@ from .initial_data import (
     test_complaint_reply_data, test_question_answer_data,
     test_complaint_reply_data, test_question_answer_data,
     test_question_data, test_tender_data, test_tender_data_multiple_lots
     test_question_data, test_tender_data, test_tender_data_multiple_lots
 )
 )
-import calendar
 import os
 import os
 import time
 import time
 
 
@@ -222,24 +221,6 @@ def procuringEntity_name(INITIAL_TENDER_DATA):
     INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"Повна назва невідомо чого"
     INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"Повна назва невідомо чого"
     return INITIAL_TENDER_DATA
     return INITIAL_TENDER_DATA
 
 
-##Newtend
-def newtend_date_picker_index(isodate):
-    now = datetime.today()
-    date_str = '01' + str(now.month) + str(now.year)
-    first_day_of_month = datetime.strptime(date_str, "%d%m%Y")
-    mod = first_day_of_month.isoweekday() - 2
-    iso_dt=parse_date(isodate)
-    last_day_of_month = calendar.monthrange(now.year, now.month)[1] 
-    #LOGGER.log_message(Message("last_day_of_month: {}".format(last_day_of_month), "INFO")) 
-    if now.day>iso_dt.day:
-        mod = calendar.monthrange(now.year, now.month)[1] + mod
-    return mod + iso_dt.day
-
-def Update_data_for_Newtend(INITIAL_TENDER_DATA):
-    #INITIAL_TENDER_DATA.data.items[0].classification['description'] = u"Картонки"
-    INITIAL_TENDER_DATA.data.procuringEntity['name'] = u"openprocurement"
-    return INITIAL_TENDER_DATA
-
 def subtract_from_time(date_time,substr_min,substr_sec):
 def subtract_from_time(date_time,substr_min,substr_sec):
     now = datetime.strptime(date_time,"%d.%m.%Y %H:%M")
     now = datetime.strptime(date_time,"%d.%m.%Y %H:%M")
     now = (now - timedelta(minutes=int(substr_min), seconds = int (substr_sec) )).isoformat()
     now = (now - timedelta(minutes=int(substr_min), seconds = int (substr_sec) )).isoformat()