Skip to content

Commit

Permalink
Merge branch 'UniversoLibre/por-hora' into release-0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppaez
ppaez committed Feb 13, 2016
2 parents 9d706a4 + 516223f commit 8a13bc7
Show file tree
Hide file tree
Showing 4 changed files with 176 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ admin-cfdi
Ver archivo contributors.txt

:Fecha:
01/04/2015
07/12/2015

:Ultima Versión:
0.3.0
Expand Down
27 changes: 27 additions & 0 deletions admin-cfdi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,27 @@ class Application(pygubu.TkApplication):
days_month = self.util.get_days(now.year, now.month) + 1
days = ['%02d' % x for x in range(0, days_month)]
self.util.combo_values(combo, days, 0)

hours = ['%02d' % x for x in range(24)]
combo = self._get_object('combo_start_hour')
self.util.combo_values(combo, hours, 0)
combo = self._get_object('combo_end_hour')
self.util.combo_values(combo, hours, 23)
minutes = ['%02d' % x for x in range(60)]
combo = self._get_object('combo_start_minute')
self.util.combo_values(combo, minutes, 0)
combo = self._get_object('combo_start_second')
self.util.combo_values(combo, minutes, 0)
combo = self._get_object('combo_end_minute')
self.util.combo_values(combo, minutes, 59)
combo = self._get_object('combo_end_second')
self.util.combo_values(combo, minutes, 59)

if not APP_LIBO:
self._config('radio_ods', {'state': 'disabled'})
self._config('radio_json', {'state': 'disabled'})
self._config('button_select_template_json', {'state': 'disabled'})

self._set('mail_port', 993)
self._get_object('check_ssl').invoke()
self._focus_set('text_rfc')
Expand Down Expand Up @@ -496,6 +517,12 @@ class Application(pygubu.TkApplication):
'mes': self._get('search_month'),
'día': search_day,
'mes_completo_por_día': sat_month,
'start_hour': self._get('start_hour'),
'start_minute': self._get('start_minute'),
'start_second': self._get('start_second'),
'end_hour': self._get('end_hour'),
'end_minute': self._get('end_minute'),
'end_second': self._get('end_second'),
}

return True, data
Expand Down
163 changes: 141 additions & 22 deletions admincfdi/ui/mainwindow.ui
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version='1.0' encoding='utf-8'?>
<interface>
<object class="tk.Frame" id="mainwindow">
<property name="height">500</property>
<property name="height">600</property>
<property name="width">700</property>
<layout>
<property name="column">0</property>
<property name="propagate">True</property>
<property name="row">0</property>
<rows>
<row id="0">
<property name="pad">5</property>
</row>
</rows>
<columns>
<column id="0">
<property name="pad">5</property>
</column>
</columns>
<rows>
<row id="0">
<property name="pad">5</property>
</row>
</rows>
</layout>
<child>
<object class="ttk.Notebook" id="main_notebook">
Expand All @@ -34,21 +34,13 @@
<property name="text" translatable="yes">Descarga SAT</property>
<child>
<object class="ttk.Frame" id="frame_1">
<property name="height">500</property>
<property name="padding">10</property>
<property name="height">300</property>
<property name="padding">5</property>
<property name="width">700</property>
<layout>
<property name="column">0</property>
<property name="propagate">True</property>
<property name="row">0</property>
<rows>
<row id="0">
<property name="pad">0</property>
</row>
<row id="1">
<property name="pad">0</property>
</row>
</rows>
<columns>
<column id="0">
<property name="minsize">0</property>
Expand All @@ -61,6 +53,14 @@
<property name="pad">0</property>
</column>
</columns>
<rows>
<row id="0">
<property name="pad">0</property>
</row>
<row id="1">
<property name="pad">0</property>
</row>
</rows>
</layout>
<child>
<object class="tk.LabelFrame" id="LabelFrame_1">
Expand Down Expand Up @@ -367,7 +367,7 @@
<layout>
<property name="column">0</property>
<property name="propagate">True</property>
<property name="row">3</property>
<property name="row">4</property>
<property name="sticky">nswe</property>
</layout>
<child>
Expand Down Expand Up @@ -522,7 +522,7 @@
<property name="padx">5</property>
<property name="pady">5</property>
<property name="propagate">True</property>
<property name="row">2</property>
<property name="row">3</property>
<property name="sticky">e</property>
</layout>
</object>
Expand All @@ -539,7 +539,7 @@
<property name="column">1</property>
<property name="columnspan">3</property>
<property name="propagate">True</property>
<property name="row">2</property>
<property name="row">3</property>
<property name="sticky">w</property>
</layout>
</object>
Expand All @@ -555,11 +555,130 @@
<property name="column">3</property>
<property name="columnspan">4</property>
<property name="propagate">True</property>
<property name="row">2</property>
<property name="row">3</property>
<property name="sticky">e</property>
</layout>
</object>
</child>
<child>
<object class="tk.Frame" id="frame_hours">
<property name="height">25</property>
<property name="width">200</property>
<layout>
<property name="column">0</property>
<property name="columnspan">7</property>
<property name="pady">5</property>
<property name="propagate">True</property>
<property name="row">2</property>
<columns>
<column id="0">
<property name="pad">0</property>
</column>
</columns>
</layout>
<child>
<object class="tk.Label" id="label_start_hour">
<property name="text" translatable="yes">Hora Inicio</property>
<layout>
<property name="column">0</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
<property name="sticky">e</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_start_hour">
<property name="state">readonly</property>
<property name="textvariable">string:start_hour</property>
<property name="width">5</property>
<layout>
<property name="column">1</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_start_minute">
<property name="state">readonly</property>
<property name="textvariable">string:start_minute</property>
<property name="width">5</property>
<layout>
<property name="column">2</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_start_second">
<property name="state">readonly</property>
<property name="textvariable">string:start_second</property>
<property name="width">5</property>
<layout>
<property name="column">3</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="tk.Label" id="label_end_hours">
<property name="text" translatable="yes">Hora Final</property>
<layout>
<property name="column">4</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_end_hour">
<property name="state">readonly</property>
<property name="textvariable">string:end_hour</property>
<property name="width">5</property>
<layout>
<property name="column">5</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_end_minute">
<property name="state">readonly</property>
<property name="textvariable">string:end_minute</property>
<property name="width">5</property>
<layout>
<property name="column">6</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
<child>
<object class="ttk.Combobox" id="combo_end_second">
<property name="state">readonly</property>
<property name="textvariable">string:end_second</property>
<property name="width">5</property>
<layout>
<property name="column">7</property>
<property name="padx">10</property>
<property name="propagate">True</property>
<property name="row">0</property>
</layout>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
Expand All @@ -571,7 +690,7 @@
<property name="column">0</property>
<property name="pady">10</property>
<property name="propagate">True</property>
<property name="row">4</property>
<property name="row">5</property>
</layout>
<child>
<object class="tk.Button" id="button_download_sat">
Expand Down Expand Up @@ -2249,7 +2368,7 @@
<object class="tk.LabelFrame" id="label_frame_comun">
<property name="borderwidth">0</property>
<property name="height">200</property>
<property name="pady">15</property>
<property name="pady">5</property>
<property name="width">200</property>
<layout>
<property name="column">0</property>
Expand Down
7 changes: 7 additions & 0 deletions admincfdi/values.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,14 @@ class Global(object):
'page_emisor': page_cfdi.format('ConsultaEmisor.aspx'),
'resultados': 'ctl00_MainContent_PnlResultados',
'noresultados': 'ctl00_MainContent_PnlNoResultados',
'start_hour': 'ctl00_MainContent_CldFecha_DdlHora',
'start_minute': 'ctl00_MainContent_CldFecha_DdlMinuto',
'start_second': 'ctl00_MainContent_CldFecha_DdlSegundo',
'end_hour': 'ctl00_MainContent_CldFecha_DdlHoraFin',
'end_minute': 'ctl00_MainContent_CldFecha_DdlMinutoFin',
'end_second': 'ctl00_MainContent_CldFecha_DdlSegundoFin',
}

frm_1 = '%(asctime)s - %(levelname)s - %(lineno)s - %(message)s'
CONF_LOG = {
'version': 1,
Expand Down

0 comments on commit 8a13bc7

Please sign in to comment.