nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix navigation

Browse source
This commit is contained in:
Romain Bignon 2013-04-01 18:43:53 +02:00
commit 4f49f96880
2 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/caissedepargne/browser.py
View file

@ -72,7 +72,10 @@ class CaisseEpargne(BaseBrowser):
self.DOMAIN = v.netloc self.DOMAIN = v.netloc
def get_accounts_list(self): def get_accounts_list(self):
self.location(self.buildurl('/Portail.aspx')) if self.is_on_page(IndexPage):
self.page.go_list()
else:
self.location(self.buildurl('/Portail.aspx'))
return self.page.get_list() return self.page.get_list()
@ -87,7 +90,10 @@ class CaisseEpargne(BaseBrowser):
return None return None
def _get_history(self, link_type, id): def _get_history(self, link_type, id):
self.location(self.buildurl('/Portail.aspx')) if self.is_on_page(IndexPage):
self.page.go_list()
else:
self.location(self.buildurl('/Portail.aspx'))
self.page.go_history(link_type, id) self.page.go_history(link_type, id)

31
modules/caissedepargne/pages.py
View file

@ -42,7 +42,7 @@ class LoginPage(BasePage):
def login(self, login): def login(self, login):
self.browser.select_form(name='Main') self.browser.select_form(name='Main')
self.browser.set_all_readonly(False) self.browser.set_all_readonly(False)
self.browser['ctl01$CC_ind_pauthpopup$ctl01$CC_ind_ident$ctl01$CC_ind_inputuserid_sup$txnuabbd'] = login self.browser['ctl01$CC_ind_pauthpopup$ctl01$CC_ind_ident$ctl01$CC_ind_inputuserid_sup$txnuabbd'] = login.encode('utf-8')
self.browser['__EVENTTARGET'] = 'ctl01$CC_ind_pauthpopup$ctl01$CC_ind_ident$ctl01$CC_ind_inputuserid_sup$btnValider' self.browser['__EVENTTARGET'] = 'ctl01$CC_ind_pauthpopup$ctl01$CC_ind_ident$ctl01$CC_ind_inputuserid_sup$btnValider'
self.browser.submit(nologin=True) self.browser.submit(nologin=True)
@ -138,6 +138,20 @@ class IndexPage(BasePage):
return accounts.itervalues() return accounts.itervalues()
def go_list(self):
self.browser.select_form(name='main')
self.browser.set_all_readonly(False)
self.browser['__EVENTTARGET'] = 'Menu_AJAX'
self.browser['__EVENTARGUMENT'] = 'CPTSYNT0'
self.browser.controls.append(ClientForm.TextControl('text', 'm_ScriptManager', {'value': ''}))
self.browser['m_ScriptManager'] = 'm_ScriptManager|Menu_AJAX'
self.browser.controls.remove(self.browser.find_control(name='Cartridge$imgbtnMessagerie', type='image'))
self.browser.controls.remove(self.browser.find_control(name='MM$m_CH$ButtonImageFondMessagerie', type='image'))
self.browser.controls.remove(self.browser.find_control(name='MM$m_CH$ButtonImageMessagerie', type='image'))
self.browser.submit()
def go_history(self, link_type, id): def go_history(self, link_type, id):
self.browser.select_form(name='main') self.browser.select_form(name='main')
self.browser.set_all_readonly(False) self.browser.set_all_readonly(False)
@ -153,11 +167,22 @@ class IndexPage(BasePage):
def get_history(self): def get_history(self):
i = 0 i = 0
ignore = False
for tr in self.document.xpath('//table[@cellpadding="1"]/tr'): for tr in self.document.xpath('//table[@cellpadding="1"]/tr'):
if tr.attrib.get('class', '') == 'DataGridHeader': tds = tr.findall('td')
if len(tds) < 5:
continue continue
tds = tr.findall('td') if tr.attrib.get('class', '') == 'DataGridHeader':
if tds[2].text == u'Titulaire':
ignore = True
else:
ignore = False
continue
if ignore:
continue
t = Transaction(i) t = Transaction(i)