verdnatura/hedera-web
verdnatura
/
hedera-web
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Bugs solucionados

This commit is contained in:
Juan Ferrer Toribio 2015-04-01 10:24:15 +02:00
parent d4f34b4ed1
commit 835492a3cd
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/DEBIAN/control
View File

@ -1,5 +1,5 @@
Package: hedera-web Package: hedera-web
Version: 1.0-45 Version: 1.0-47
Architecture: all Architecture: all
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es> Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
Depends: apache2, php5-mysql, php-vn-web Depends: apache2, php5-mysql, php-vn-web

4
package/usr/share/hedera-web/forms/ecomerce/catalog/style.css
View File

@ -102,9 +102,10 @@ button.basket
{ {
width: 100%; width: 100%;
height: 2.5em; height: 2.5em;
font-size: 1.1em;
text-align: center; text-align: center;
background-color: #00BCD4; background-color: #00BCD4;
font-size: 1.1em; box-shadow: 0 0.2em 0.2em #BBB;
} }
button.basket:hover button.basket:hover
{ {
@ -129,6 +130,7 @@ button.basket:hover
text-align: center; text-align: center;
margin-top: 1em; margin-top: 1em;
vertical-align: middle; vertical-align: middle;
box-shadow: 0 0 0.4em #AAA;
} }
.htk-realm img .htk-realm img
{ {

10
package/usr/share/hedera-web/forms/ecomerce/ticket/ui.xml
View File

@ -37,7 +37,7 @@
<label><t>TicketNumber:</t></label> <label><t>TicketNumber:</t></label>
</td> </td>
<td> <td>
<htk-label column="id" form="ticket"/> <htk-text column="id" form="ticket"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -53,7 +53,7 @@
<label><t>SendMethod:</t></label> <label><t>SendMethod:</t></label>
</td> </td>
<td> <td>
<htk-label column="Agencia" form="ticket"/> <htk-text column="Agencia" form="ticket"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -61,7 +61,7 @@
<label><t>Notes:</t></label> <label><t>Notes:</t></label>
</td> </td>
<td> <td>
<htk-label column="note" form="ticket"/> <htk-text column="note" form="ticket"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -69,9 +69,9 @@
<label for="total"><t>Subtotal:</t></label> <label for="total"><t>Subtotal:</t></label>
</td> </td>
<td> <td>
<htk-label format="%.2d€"> <htk-text format="%.2d€">
<db-calc-sum id="ticket-subtotal" model="movements"/> <db-calc-sum id="ticket-subtotal" model="movements"/>
</htk-label> </htk-text>
</td> </td>
</tr> </tr>
</tbody> </tbody>

3
package/usr/share/hedera-web/js/db/model.js
View File

@ -414,8 +414,7 @@ Db.Model.implement
,_checkTableUpdatable: function (tableIndex) ,_checkTableUpdatable: function (tableIndex)
{ {
var tableUpdatable = this._updatable var tableUpdatable = tableIndex !== null
&& tableIndex !== null
&& this.tables[tableIndex].pks.length > 0; && this.tables[tableIndex].pks.length > 0;
if (!tableUpdatable) if (!tableUpdatable)

14
package/usr/share/hedera-web/js/htk/grid.js
View File

@ -40,6 +40,8 @@ Htk.Grid = new Class
,columns: new Array () ,columns: new Array ()
,internalColumn: null ,internalColumn: null
,internalColumns: 0 ,internalColumns: 0
,sortColumn: -1
,sortWay: null
,initialize: function () ,initialize: function ()
{ {
@ -237,7 +239,17 @@ Htk.Grid = new Class
var columnIndex = column.columnIndex; var columnIndex = column.columnIndex;
if (this._model && columnIndex != -1) if (this._model && columnIndex != -1)
this._model.sort (columnIndex); {
if (this.sortColumn === columnIndex
&& this.sortWay === Db.Model.SortWay.ASC)
this.sortWay = Db.Model.SortWay.DESC;
else
this.sortWay = Db.Model.SortWay.ASC;
this.sortColumn = columnIndex;
this._model.sort (columnIndex, this.sortWay);
}
} }
,columnChanged: function (column, row, newValue) ,columnChanged: function (column, row, newValue)