parse_deliveryPeriod_date +03 +02

Playtenders
1 parent d4ae220f
Showing 4 changed files with 17 additions and 4 deletions
playtender.robot
playtender_service.py
playtender_variables.robot
playtender_viewer.robot
--- a/playtender.robot
View file @fbaffa0
+++ b/playtender.robot
View file @fbaffa0
@@ -183,6 +183,9 @@ Resource                                                        playtender_agree
 ##    run keyword if                                              ${is_test_role_owner} and '${field_name}' in 'awards[0].complaintPeriod.endDate awards[1].complaintPeriod.endDate awards[2].complaintPeriod.endDate awards[3].complaintPeriod.endDate'  fix awards data in global Users variable  ${username}
     open tender page by uaid                                    ${tender_uaid}
+    Run Keyword And Return If                                   '${field_name}' == 'lots[0].minimalStep.currency'   Отримати інформацію із лоту minimalStep.currency  ${field_name}
+    Run Keyword And Return If                                   '${field_name}' == 'lots[0].minimalStep.valueAddedTaxIncluded'   Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded  ${field_name}
+    Run Keyword And Return If                                   '${field_name}' == 'lots[0].value.valueAddedTaxIncluded'   Отримати інформацію із лоту value.valueAddedTaxIncluded  ${field_name}
     Run Keyword And Return If                                   '${field_name}' == 'complaintPeriod.endDate'   Отримати інформацію із complaintPeriod.endDate
     Run Keyword And Return If                                   '${field_name}' == 'items[0].deliveryLocation.latitude'   Fail   Поле не відображаем
     run keyword if                                              '${field_name}' == 'status'  wait for tender status
--- a/playtender_service.py
View file @fbaffa0
+++ b/playtender_service.py
View file @fbaffa0
@@ -394,7 +394,11 @@ def parse_deliveryPeriod_date1(date):
     return date
 def parse_deliveryPeriod_date(date_string):
-    date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
+#    date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
+    if '+03' in date_string:
+        date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
+    else:
+        date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+02:00")
     date = datetime(date_str.year, date_str.month, date_str.day)
     date = date.strftime("%d.%m.%Y")
     return date
--- a/playtender_variables.robot
View file @fbaffa0
+++ b/playtender_variables.robot
View file @fbaffa0
@@ -252,11 +252,13 @@ ${tender_lot_description_value_locator} =                           jquery=#lots
 ${tender_lot_value_amount_value_locator} =                          jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
 ${tender_lot_value_amount_value_type} =                             float
 ${tender_lot_value_currency_value_locator} =                        jquery=#tender-general-info .budget-currency.hidden
-${tender_lot_value_value_added_tax_included_value_locator} =        jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
+${tender_lot_value_value_added_tax_included_value_locator} =        jquery=#lots .tabs__content .tabs__pane--visible .budget .value
+${tender_lot_minimal_step_currency_value_locator} =                 jquery=#lots .tabs__content .tabs__pane--visible .minimal-step .value
 ${tender_lot_minimal_step_amount_value_locator} =                   jquery=#lots .tabs__content .tabs__pane--visible .minimal-step-source.hidden
 ${tender_lot_minimal_step_amount_value_type} =                      float
 ${tender_lot_minimal_step_amount_currency_value_locator} =          jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
 ${tender_lot_minimal_step_amount_value_added_tax_included_value_locator} =      jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
+${tender_lot_minimal_step_value_added_tax_included_value_locator} =      jquery=#lots .tabs__content .tabs__pane--visible .minimal-step .value
 ##### BOF - TMP #####
 ${tender_lot_0_title_value_locator} =                               jquery=#lots .tabs__content .tabs__pane--visible > span div.textvalue.hidden
--- a/playtender_viewer.robot
View file @fbaffa0
+++ b/playtender_viewer.robot
View file @fbaffa0
@@ -282,7 +282,8 @@ get value from lot
 #    ${tender_lot_value_value_added_tax_included_value_locator} =        replace string  ${tender_lot_value_value_added_tax_included_value_locator_tpl}  %lot_id%  ${lot_id}
     ${return_value} =                                           get value by locator on opened page  ${tender_lot_value_value_added_tax_included_value_locator}
-    ${return_value} =                                           set variable if  ${return_value} == 1  True
+    ${return_value} =                                           set variable if  'з ПДВ' in '${return_value}'  ${True}  ${False}
+#    ${return_value} =                                           set variable if  ${return_value} == 1  True
     [return]                                                    ${return_value}
 Отримати інформацію із лоту minimalStep.currency
@@ -291,6 +292,7 @@ get value from lot
 #    ${tender_lot_minimal_step_currency_value_locator} =                replace string  ${tender_lot_minimal_step_currency_value_locator_tpl}  %lot_id%  ${lot_id}
     ${return_value} =                                           get value by locator on opened page  ${tender_lot_minimal_step_currency_value_locator}
+    ${return_value} =                                           set variable if  'UAH' in '${return_value}'  UAH
     [return]                                                    ${return_value}
 Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded
@@ -298,7 +300,9 @@ get value from lot
     [Documentation]                                             Отримати значення поля description з лоту з lot_id в описі для тендера tender_uaid.
 #    ${tender_lot_value_minimal_step_added_tax_included_value_locator} =        replace string  ${tender_lot_minimal_step_value_added_tax_included_value_locator_tpl}  %lot_id%  ${lot_id}
-    ${return_value} =                                           get value by locator on opened page  ${tender_lot_minimal_step_value_added_tax_included_value_locator}
+#    ${return_value} =                                           get value by locator on opened page  ${tender_lot_minimal_step_value_added_tax_included_value_locator}
+    ${return_value} =                                           get value by locator on opened page  ${tender_lot_value_value_added_tax_included_value_locator}
+    ${return_value} =                                           set variable if  'з ПДВ' in '${return_value}'  ${True}  ${False}
     [return]                                                    ${return_value}
 Отримати інформацію із лоту auctionPeriod.startDate