arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Add 12hour time support to time/datetime POM regions

Browse Source 
>_>
This commit is contained in:
FreneticScribbler
2020-05-27 15:46:04 -04:00
parent c065148979
commit f69365a0fb
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/settings.py
View File

@@ -202,7 +202,7 @@ FORMAT_MODULE_PATH = 'PyRIGS.formats'
USE_I18N = True USE_I18N = True
USE_L10N = False USE_L10N = True
USE_TZ = True USE_TZ = True

18
PyRIGS/tests/regions.py
View File

@@ -1,4 +1,5 @@
from pypom import Region from pypom import Region
from django.utils import timezone
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from selenium.webdriver.support import expected_conditions from selenium.webdriver.support import expected_conditions
from selenium.webdriver.remote.webelement import WebElement from selenium.webdriver.remote.webelement import WebElement
@@ -17,6 +18,15 @@ def parse_bool_from_string(string):
else: else:
return False return False
# 12-Hour vs 24-Hour Time. Affects widget display
def get_time_format():
# Default
time_format = "%H:%M"
# If system is 12hr
if timezone.now().strftime("%p"):
time_format = "%I:%M %p"
return time_format
class BootstrapSelectElement(Region): class BootstrapSelectElement(Region):
_main_button_locator = (By.CSS_SELECTOR, 'button.dropdown-toggle') _main_button_locator = (By.CSS_SELECTOR, 'button.dropdown-toggle')
@@ -127,23 +137,23 @@ class DatePicker(Region):
class TimePicker(Region): class TimePicker(Region):
@property @property
def value(self): def value(self):
return datetime.datetime.strptime(self.root.get_attribute("value"), "%H:%M") return datetime.datetime.strptime(self.root.get_attribute("value"), get_time_format())
def set_value(self, value): def set_value(self, value):
self.root.clear() self.root.clear()
self.root.send_keys(value.strftime("%H:%M")) self.root.send_keys(value.strftime(get_time_format()))
class DateTimePicker(Region): class DateTimePicker(Region):
@property @property
def value(self): def value(self):
return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d %H:%M") return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d " + get_time_format())
def set_value(self, value): def set_value(self, value):
self.root.clear() self.root.clear()
date = value.date().strftime("%d%m%Y") date = value.date().strftime("%d%m%Y")
time = value.time().strftime("%H:%M") time = value.time().strftime(get_time_format())
self.root.send_keys(date) self.root.send_keys(date)
self.root.send_keys(Keys.TAB) self.root.send_keys(Keys.TAB)