next

@@ -733,7 +733,6 @@ Wait For Sync Tender Finish
 Додати постачальника For Reporting
   [Arguments]  ${budget}  ${data}
   ${wrapper}=  Set Variable  \#collapseAward
-  ${budget}=  Convert To String  ${budget}
 
   JsSetScrollToElementBySelector  \#collapseAward
   Click Element  jquery=.panel-title a[data-toggle="collapse"][href="#collapseAward"]
@@ -750,8 +749,8 @@ Wait For Sync Tender Finish
   Input Text    jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_name  ${data.contactPoint.name}
   Input Text    jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_email  ${data.contactPoint.email}
   Input Text    jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_phone  ${data.contactPoint.telephone}
-  Input Text    jquery=${wrapper} \#tenderreportingform-award_value_amount  ${budget}
-
+  Input Float    ${wrapper} \#tenderreportingform-award_value_amount  ${budget}
+	
 Додати постачальника For Reporting Fake
   ${identifier}  Create Dictionary    id=1234567890
   ${address}  Create Dictionary    region=місто Київ  postalCode=123  locality=Київ  streetAddress=address
@@ -915,7 +914,7 @@ Wait For Sync Tender Finish
   [Arguments]  ${field}  ${value}
 
   JsSetScrollToElementBySelector  \#contractform-contract_number
-  Run Keyword If  '${field}' == 'value.amount'  Input Text  id=contractform-value_amount  ${value}
+  Run Keyword If  '${field}' == 'value.amount'  Input Float  \#contractform-value_amount  ${value}
   Run Keyword If  '${field}' == 'dateSigned'  Input DateTime  \#contractform-date_signed  ${value}
   Run Keyword If  '${field}' == 'period.startDate'  Input DateTime  \#contractform-date_start  ${value}
   Run Keyword If  '${field}' == 'period.endDate'  Input DateTime  \#contractform-date_end  ${value}
@@ -1308,7 +1307,7 @@ Save Tender
   Click Element   xpath=//button[contains(text(), 'Надати відповідь')]
   Sleep  1
   Click Element   xpath=//div[contains(@class, 'jconfirm')]//button[contains(text(), 'Закрити')]
-  Sleep  2
+  Sleep  20
 
 Відповісти на вимогу
   [Arguments]  ${username}  ${tender_uaid}  ${claim_id}  ${answer}  ${award_index}
@@ -2248,9 +2247,9 @@ Save Proposal
   ### BOF - Esco ###
   Run Keyword If   '${arguments[2]}' == 'awards[4].complaintPeriod.endDate'  JsOpenAwardByIndex  4
   Run Keyword And Return If   '${arguments[2]}' == 'awards[4].complaintPeriod.endDate'  get_invisible_text  jquery=.award-list-wrapper:first .panel-collapse.in .complaint-period-end-date.hidden
-  Run Keyword And Return If   '${arguments[2]}' == 'minimalStepPercentage'  get_invisible_text  jquery=#tender-general-info > p.minimal-step-percentage-source.hidden
-  Run Keyword And Return If   '${arguments[2]}' == 'yearlyPaymentsPercentageRange'  get_invisible_text  jquery=#tender-general-info > p.yearly-payments-percentage-range-source.hidden
-  Run Keyword And Return If   '${arguments[2]}' == 'fundingKind'  get_invisible_text  jquery=#tender-general-info > p.funding-kind-source.hidden
+  Run Keyword And Return If   '${arguments[2]}' == 'minimalStepPercentage'  get_invisible_text  jquery=#tender-general-info .minimal-step-percentage-source.hidden
+  Run Keyword And Return If   '${arguments[2]}' == 'yearlyPaymentsPercentageRange'  get_invisible_text  jquery=#tender-general-info .yearly-payments-percentage-range-source.hidden
+	  Run Keyword And Return If   '${arguments[2]}' == 'fundingKind'  get_invisible_text  jquery=#tender-general-info .funding-kind-source.hidden
   ### EOF - Esco ###
 
   Fail  Потрібна реалізація в "Отримати інформацію із тендера"
@@ -2281,7 +2280,7 @@ Save Proposal
   Run Keyword And Return If   'minimalStep.valueAddedTaxIncluded' == '${arguments[2]}'   Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded  ${arguments[1]}
   Run Keyword And Return If   'auctionPeriod.startDate' == '${arguments[2]}'  get_invisible_text  jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-start-date.hidden
   Run Keyword And Return If   'auctionPeriod.endDate' == '${arguments[2]}'  get_invisible_text  jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-end-date.hidden
-  Run Keyword And Return If   'minimalStepPercentage' == '${arguments[2]}'   Get invisible text number by locator  jquery=#accordionLots .lot-info-wrapper:first .minimal-step-percentage-source.hidden
+  Run Keyword And Return If   'minimalStepPercentage' == '${arguments[2]}'  Get invisible text number by locator  jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .minimal-step-percentage-source.hidden
   Run Keyword And Return If   'fundingKind' == '${arguments[2]}'   get_invisible_text  jquery=#accordionLots .lot-info-wrapper:first .funding-kind-source.hidden
   Run Keyword And Return If   'yearlyPaymentsPercentageRange' == '${arguments[2]}'  Get invisible text number by locator   jquery=#accordionLots .lot-info-wrapper:first .yearly-payments-percentage-range-source.hidden
 
@@ -3173,7 +3172,6 @@ Switch To Complaints
   ${data}=  Get From Dictionary  ${plan_data}  data
   ${data_keys}=  Get Dictionary Keys  ${data}
   ${start_date}=  convert_isodate_to_site_date  ${data.tender.tenderPeriod.startDate}
-  ${budget_keys}=  Get Dictionary Keys  ${data.budget}
   ${budget_amount}=  Convert To String  ${data.budget.amount}
   ${classificationWrapper}=  Set Variable  \#collapseGeneral
   ${itemsWrapper}=  Set Variable  a[href='#collapseItems']
@@ -3192,7 +3190,7 @@ Switch To Complaints
   Run Keyword If  'period' in ${budget_keys}  input datetime  \#planform-period_end_date  ${data.budget.period.endDate}
   JsInputHiddenText  \#planform-budget_id  ${data.budget.id}
   Input text  id=planform-title  ${data.budget.description}
-  Input text  id=planform-value_amount  ${budget_amount}
+  Input Float  \#planform-value_amount  ${data.budget.amount}
   Select From List By Value  id=planform-value_currency  ${data.budget.currency}
   JsInputHiddenText  \#planform-project_id  ${data.budget.project.id}
   JsInputHiddenText  \#planform-project_name  ${data.budget.project.name}
@@ -3524,7 +3522,7 @@ GetTenderAuctionEndStatus
 
 Input Float
   [Arguments]  ${input_jquery_selector}  ${value}
-  ${value}=          Convert To String  ${value}
+  ${value}=          convert_float_to_string  ${value}
   Input Text  jquery=${input_jquery_selector}  ${value}
 
 Input Float Multiply100

@@ -5,7 +5,6 @@ from robot.libraries.BuiltIn import BuiltIn
 from robot.output import librarylogger
 import urllib
 import urllib3
-#import decimal
 
 def get_library():
     return BuiltIn().get_library_instance('Selenium2Library')
@@ -103,8 +102,8 @@ def get_text_excluding_children(locator):
     return text.strip()
 
 def convert_float_to_string(number):
-    return format(number, '.2f')
-
+    return repr(number);
+	
 def convert_date_for_compare_ex(datestr):
     return datetime.strptime(datestr, "%d.%m.%Y %H:%M").strftime("%Y-%m-%d %H:%M+02:00")