_Catalog
@@ -136,36 +116,34 @@
directory="catalog"
subdir="200x200"
lot="item"
- name="Foto"
+ name="image"
full-dir="900x900"/>
{{item.Article}}
+ {{item.name}}
{{item.producer}}
- @{{item.item_id}}
+ @{{item.id}}
- _Size {{item.Medida}}
- _Category {{item.Categoria}}
+ _Size {{item.size}}
+ _Category {{item.category}}
- _Color {{item.color}}
-
{{item.available}}
-
- _from
-
+ _from
+ class="categories-box">
- SELECT r.id, l.str name, r.color
- FROM vn2008.reinos r
- LEFT JOIN vn_locale.realm_view l ON l.realm_id = r.id
- WHERE r.display != FALSE
- ORDER BY name
+ SELECT c.id, l.name, c.color
+ FROM vn.itemCategory c
+ JOIN vn.itemCategoryL10n l ON l.id = c.id
+ WHERE c.display > 0
+ ORDER BY l.name
-
+
-
- _Choose a realm
+
+ _Order by
+ _Choose a category
_Filter by
+ result-index="1">
CALL item_available ();
- SELECT DISTINCT t.tipo_id, l.str name
- FROM vn2008.Tipos t
- JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id
- LEFT JOIN vn_locale.family_view l ON l.family_id = t.tipo_id
- JOIN tmp.item_available i ON i.item_id = a.Id_Article
- WHERE t.reino_id = #realm
+ SELECT DISTINCT t.id, l.name
+ FROM vn.itemType t
+ JOIN vn.item i ON i.typeFk = t.id
+ JOIN tmp.item_available a ON a.item_id = i.id
+ JOIN vn.itemTypeL10n l ON l.id = t.id
+ WHERE t.categoryFk = #category
ORDER BY name
-
-
- _Order by
-
-
@@ -301,23 +252,23 @@
directory="catalog"
subdir="200x200"
lot="card"
- name="Foto"
+ name="image"
full-dir="900x900"
conn="conn"
editable="true"/>
- {{card.Article}}
+ {{card.name}}
{{card.producer}}
- _Size {{card.Medida}},
- _Category {{card.categoria}}
+ _Size {{card.size}},
+ _Category {{card.category}}
- _Color {{card.color}}
+ _Color {{card.inkFk}}
@@ -356,22 +307,4 @@
-
\ No newline at end of file
diff --git a/forms/ecomerce/checkout/ui.xml b/forms/ecomerce/checkout/ui.xml
index 25c71ca3..bb1872df 100755
--- a/forms/ecomerce/checkout/ui.xml
+++ b/forms/ecomerce/checkout/ui.xml
@@ -109,6 +109,7 @@
id="agency"
lot="lot"
name="agency"
+ show-field="description"
on-changed="onFieldChange"
model="agencies"/>
@@ -120,6 +121,7 @@
id="warehouse"
lot="lot"
name="agency"
+ show-field="description"
on-changed="onFieldChange"
model="agencies"/>
diff --git a/js/htk/field.js b/js/htk/field.js
index b83316d4..9c2393d5 100644
--- a/js/htk/field.js
+++ b/js/htk/field.js
@@ -104,11 +104,14 @@ module.exports = new Class
}
,_editable: true
+ ,_lockEntry: false
,_setValue: function (newValue)
{
Vn.ParamIface.prototype._setValue.call (this, newValue);
- this.putValue (newValue);
+
+ if (!this._lockEntry)
+ this.putValue (newValue);
if (this.conditionalFunc)
this.conditionalFunc (this, newValue);
@@ -122,7 +125,9 @@ module.exports = new Class
*/
,valueChanged: function (value)
{
+ this._lockEntry = true;
this._setValue (value);
+ this._lockEntry = false;
}
/**
diff --git a/js/htk/field/combo.js b/js/htk/field/combo.js
index 866a93c1..34eb2137 100644
--- a/js/htk/field/combo.js
+++ b/js/htk/field/combo.js
@@ -125,24 +125,48 @@ module.exports = new Class
return this._params;
}
}
+ ,valueField:
+ {
+ type: String,
+ value: 'id'
+ }
+ ,showField:
+ {
+ type: String,
+ value: 'name'
+ }
}
,_row: -1
,_model: null
- ,valueColumnIndex: 0
- ,valueColumnName: null
- ,showColumnIndex: 1
- ,showColumnName: null
- ,_notNull: true
- ,_webkitRefresh: false
+ ,_notNull: false
,render: function ()
{
- var button = this.createRoot ('button');
+ var node = this.createRoot ('div');
+ node.className = 'htk-combo';
+
+ var clearButton = this.createElement ('htk-icon');
+ clearButton.className = 'clear';
+ clearButton.icon = 'close';
+ clearButton.on ('click', this._onClearClick, this);
+ node.appendChild (clearButton.node);
+
+ var button = this.createElement ('button');
button.type = 'button';
- button.className = 'htk-select input';
+ button.className = 'htk-combo input';
button.addEventListener ('mousedown',
this._onButtonMouseDown.bind (this));
+ node.appendChild (button);
+
+ this.button = button;
+ this.clearButton = clearButton;
+ this._refreshShowText ();
+ }
+
+ ,_onClearClick: function ()
+ {
+ this.value = null;
}
,_setRow: function (row)
@@ -150,7 +174,6 @@ module.exports = new Class
this._row = row;
this._refreshShowText ();
this.rowChanged ();
- this.changed ();
}
,_onButtonMouseDown: function (e)
@@ -164,7 +187,7 @@ module.exports = new Class
var model = this._model;
var menu = this.createElement ('div');
- menu.className = 'htk-select-menu';
+ menu.className = 'htk-combo-menu';
var grid = new Htk.Grid ({showHeader: false});
menu.appendChild (grid.node);
@@ -173,7 +196,7 @@ module.exports = new Class
gridNode.addEventListener ('click',
this._onGridClicked.bind (this, grid));
- var column = new ColumnText ({columnIndex: this.showColumnIndex});
+ var column = new ColumnText ({column: this.showField});
grid.appendColumn (column);
grid.model = model;
@@ -199,7 +222,7 @@ module.exports = new Class
var row = target.rowIndex - 1;
if (row >= 0)
- value = this._model.getByIndex (row, this.valueColumnIndex);
+ value = this._model.get (row, this.valueField);
else
value = null;
@@ -221,7 +244,7 @@ module.exports = new Class
var model = this._model;
if (this._row !== -1)
- var showText = model.getByIndex (this._row, this.showColumnIndex);
+ var showText = model.get (this._row, this.showField);
else if (model && model.status === Db.Model.Status.LOADING)
var showText = _('Loading...');
else if (this._placeholder)
@@ -229,7 +252,18 @@ module.exports = new Class
else
var showText = '';
- Vn.Node.setText (this.node, showText);
+ if (this.node)
+ {
+ var visibility;
+
+ if (this._value && !this._notNull)
+ visibility = 'visible';
+ else
+ visibility = 'hidden';
+
+ this.clearButton.node.style.visibility = visibility;
+ Vn.Node.setText (this.button, showText);
+ }
}
,_onModelChange: function ()
@@ -259,7 +293,7 @@ module.exports = new Class
var row;
if (this._model && this._model.ready)
- row = this._model.searchByIndex (this.valueColumnIndex, this._value);
+ row = this._model.search (this.valueField, this._value);
else
row = -1;
diff --git a/js/htk/style.css b/js/htk/style.css
index 58ea0a71..14b1af65 100644
--- a/js/htk/style.css
+++ b/js/htk/style.css
@@ -134,35 +134,60 @@ td.cell-image .htk-image
/* Select */
-.htk-select
+.htk-combo
+{
+ position: relative;
+}
+.htk-combo > button
{
max-width: 100%;
height: 2em;
text-align: left;
+ z-index: 1;
}
-.htk-select-menu
+.htk-combo > .clear
+{
+ position: absolute;
+ right: 0;
+ margin: .2em;
+ padding: .3em;
+ cursor: pointer;
+ z-index: 2;
+ border-radius: .1em;
+ visibility: hidden;
+}
+.htk-combo:hover > .clear
+{
+ visibility: visible;
+}
+.htk-combo > .clear:hover
+{
+ background-color: rgba(0, 0, 0, 0.1)
+}
+
+.htk-combo-menu
{
max-width: 100%;
}
-.modal > .htk-select-menu
+.modal > .htk-combo-menu
{
min-width: 14em;
}
-.htk-select-menu tbody > tr
+.htk-combo-menu tbody > tr
{
border-top: none;
height: 2.5em;
}
-.htk-select-menu td.message
+.htk-combo-menu td.message
{
padding: 1em;
}
-.htk-select-menu tr:hover
+.htk-combo-menu tr:hover
{
background-color: rgba(1, 1, 1, 0.1);
cursor: pointer;
}
-.htk-select-menu td
+.htk-combo-menu td
{
max-width: 0;
overflow: hidden;
diff --git a/js/sql/delete.js b/js/sql/delete.js
index 5dfbc1e3..f05ed70f 100644
--- a/js/sql/delete.js
+++ b/js/sql/delete.js
@@ -11,13 +11,9 @@ module.exports = new Class
,render: function (params)
{
- var sql = 'DELETE FROM '
- + this.renderTarget (params);
-
- if (this.where)
- sql += ' WHERE ' + this.where.render (params);
-
- sql += this.renderLimit(params);
- return sql;
+ return 'DELETE FROM'
+ + this.renderTarget (params)
+ + this.renderIfSet (this.where, 'WHERE', params)
+ + this.renderLimit (params);
}
});
diff --git a/js/sql/dml.js b/js/sql/dml.js
index ab5cf0db..f7f2fbf4 100644
--- a/js/sql/dml.js
+++ b/js/sql/dml.js
@@ -15,14 +15,14 @@ module.exports = new Class
,addSet: function (fieldName, value)
{
- this.expr.push (new Value ({value: value}));
this.field.push (new Field ({name: fieldName}));
+ this.expr.push (new Value ({value: value}));
}
,addExpr: function (fieldName, expr)
{
- this.expr.push (expr);
this.field.push (new Field ({name: fieldName}));
+ this.expr.push (expr);
}
,delSet: function ()
diff --git a/js/sql/field.js b/js/sql/field.js
index 29904b6d..ccd7f1bf 100644
--- a/js/sql/field.js
+++ b/js/sql/field.js
@@ -32,12 +32,7 @@ module.exports = new Class
,render: function ()
{
- var sql = '';
-
- if (this.target)
- sql += this.renderIdentifier (this.target) +'.';
-
- sql += this.renderIdentifier (this.name);
- return sql;
+ return this.renderPreIdent (this.target)
+ + this.renderIdent (this.name);
}
});
diff --git a/js/sql/filter.js b/js/sql/filter.js
index 8617d42b..53e9f8ec 100644
--- a/js/sql/filter.js
+++ b/js/sql/filter.js
@@ -36,7 +36,7 @@ module.exports = new Class
this.exprs.forEach (function (expr) {
if (expr.isReady (params))
- newExprs.push (exprs[i]);
+ newExprs.push (expr);
})
if (newExprs.length > 0)
diff --git a/js/sql/function.js b/js/sql/function.js
index c6dbf4e7..113d0de9 100644
--- a/js/sql/function.js
+++ b/js/sql/function.js
@@ -47,15 +47,10 @@ module.exports = new Class
,render: function (params)
{
- var sql = '';
-
- if (this.schema)
- sql += this.renderIdentifier (this.schema) +'.';
-
- sql += this.renderIdentifier (this.name)
+ return this.renderPreIdent (this.schema)
+ + this.renderIdent (this.name)
+ '('
+ this.renderListWs (this.list, params, ', ')
+ ')';
- return sql;
}
});
diff --git a/js/sql/insert.js b/js/sql/insert.js
index 34bff4b9..0f6b46a9 100644
--- a/js/sql/insert.js
+++ b/js/sql/insert.js
@@ -10,7 +10,7 @@ module.exports = new Class
,render: function (params)
{
- return 'INSERT INTO '
+ return 'INSERT INTO'
+ this.renderTarget (params)
+ ' ('
+ this.renderListWs (this.field, params, ', ')
diff --git a/js/sql/join-item.js b/js/sql/join-item.js
index f250ec7f..8a765790 100644
--- a/js/sql/join-item.js
+++ b/js/sql/join-item.js
@@ -3,7 +3,12 @@ var Target = require ('./target');
var Expr = require ('./expr');
var SqlObject = require ('./object');
var Type = require ('./join').Type;
-var TypeSql = require ('./join').TypeSql;
+
+var TypeSql = [
+ 'INNER',
+ 'LEFT',
+ 'RIGHT'
+];
/**
* The equivalent of a SQL join.
diff --git a/js/sql/join.js b/js/sql/join.js
index 45c10896..40664d30 100644
--- a/js/sql/join.js
+++ b/js/sql/join.js
@@ -14,16 +14,9 @@ var Type = {
RIGHT : 2
};
-var TypeSql = [
- 'INNER',
- 'LEFT',
- 'RIGHT'
-];
-
Klass.extend
({
- Type: Type,
- TypeSql: TypeSql
+ Type: Type
});
Klass.implement
@@ -52,7 +45,9 @@ Klass.implement
,render: function (params)
{
- return '('+ this.target.render (params) +' '
+ return '('
+ + this.target.render (params)
+ + ' '
+ this.renderList (this.list, params)
+ ')';
}
diff --git a/js/sql/list-holder.js b/js/sql/list-holder.js
index 34a01cdf..4e42825f 100644
--- a/js/sql/list-holder.js
+++ b/js/sql/list-holder.js
@@ -5,6 +5,7 @@ module.exports = new Class
({
Properties:
{
+/*
list:
{
type: Array
@@ -17,13 +18,14 @@ module.exports = new Class
return this._list;
}
}
+*/
}
- ,_list: []
+ ,list: []
,appendChild: function (child)
{
- this._list.push (child);
+ this.list.push (child);
}
/**
@@ -33,7 +35,7 @@ module.exports = new Class
*/
,push: function (element)
{
- this._list.push (element);
+ this.list.push (element);
}
/**
@@ -43,7 +45,7 @@ module.exports = new Class
*/
,splice: function (i)
{
- this._list.splice (i);
+ this.list.splice (i);
}
/**
@@ -53,6 +55,6 @@ module.exports = new Class
*/
,get: function (i)
{
- return this._list[i];
+ return this.list[i];
}
});
diff --git a/js/sql/multi-stmt.js b/js/sql/multi-stmt.js
index 25efc4d3..67fcfe40 100644
--- a/js/sql/multi-stmt.js
+++ b/js/sql/multi-stmt.js
@@ -31,12 +31,6 @@ module.exports = new Class
,render: function (params)
{
- var sql = '';
-
- this._list.forEach (function (stmt) {
- sql += stmt.render (params) +";\n";
- });
-
- return sql;
+ return this.renderListWs (this.list, params, ";\n");
}
});
diff --git a/js/sql/object.js b/js/sql/object.js
index dac1fec0..7906d11a 100644
--- a/js/sql/object.js
+++ b/js/sql/object.js
@@ -76,10 +76,24 @@ module.exports = new Class
* @param {String} identifier The identifier
* @return {string} The quoted identifier
*/
- ,renderIdentifier: function (identifier)
+ ,renderIdent: function (identifier)
{
return '`'+ identifier +'`';
}
+
+ /**
+ * Renders a quoted SQL identifier.
+ *
+ * @param {String} identifier The identifier
+ * @return {string} The quoted identifier
+ */
+ ,renderPreIdent: function (identifier)
+ {
+ if (identifier)
+ return this.renderIdent (identifier) +'.';
+ else
+ return '';
+ }
/**
* Renders the object if it's defined.
diff --git a/js/sql/operation.js b/js/sql/operation.js
index 5f8284fb..639ad3c6 100644
--- a/js/sql/operation.js
+++ b/js/sql/operation.js
@@ -18,6 +18,16 @@ var Type =
,AND : 2
,OR : 3
,REGEXP : 4
+ ,LOWER : 5
+ ,UPPER : 6
+ ,LE : 7
+ ,UE : 8
+ ,PLUS : 9
+ ,MINUS : 10
+ ,MULT : 11
+ ,DIV : 12
+ ,NE : 13
+ ,MOD : 14
};
var Operators =
@@ -27,6 +37,16 @@ var Operators =
,'AND'
,'OR'
,'REGEXP'
+ ,'<'
+ ,'>'
+ ,'<='
+ ,'>='
+ ,'+'
+ ,'-'
+ ,'*'
+ ,'/'
+ ,'<>'
+ ,'MOD'
];
Klass.extend
@@ -47,6 +67,11 @@ Klass.implement
enumType: Type
,value: -1
},
+ target:
+ {
+ type: String
+ ,value: null
+ },
exprs:
{
type: Array
diff --git a/js/sql/select.js b/js/sql/select.js
index 37fbb5b1..958ae69a 100644
--- a/js/sql/select.js
+++ b/js/sql/select.js
@@ -18,15 +18,11 @@ module.exports = new Class
,render: function (params)
{
- var sql = 'SELECT '
+ return 'SELECT '
+ this.renderListWs (this.expr, params, ', ')
- + ' FROM '
- + this.renderTarget (params);
-
- if (this.where)
- sql += ' WHERE ' + this.where.render (params);
-
- sql += this.renderLimit (params);
- return sql;
+ + ' FROM'
+ + this.renderTarget (params)
+ + this.renderIfSet (this.where, 'WHERE', params)
+ + this.renderLimit (params);
}
});
diff --git a/js/sql/stmt.js b/js/sql/stmt.js
index e1d4f1d1..5ae2c96e 100644
--- a/js/sql/stmt.js
+++ b/js/sql/stmt.js
@@ -32,15 +32,15 @@ module.exports = new Class
,renderTarget: function (params)
{
if (this.target.length > 0)
- return this.renderListWs (this.target, params, ', ');
+ return ' '+ this.renderListWs (this.target, params, ', ');
else
- return 'DUAL';
+ return ' DUAL';
}
,renderLimit: function ()
{
if (this.limit != null)
- return 'LIMIT '+ parseInt (this.limit);
+ return ' LIMIT '+ parseInt (this.limit);
else
return '';
}
diff --git a/js/sql/string.js b/js/sql/string.js
index ebf089b6..f95f3fbf 100644
--- a/js/sql/string.js
+++ b/js/sql/string.js
@@ -8,6 +8,7 @@ var Holder = require ('./holder');
module.exports = new Class
({
Extends: Stmt
+ ,Tag: 'sql-string'
,Properties:
{
query:
@@ -19,6 +20,12 @@ module.exports = new Class
,regexp: /#\w+/g
+ ,appendChild: function (child)
+ {
+ if (child.nodeType === Node.TEXT_NODE)
+ this.query = child.textContent;
+ }
+
,render: function (params)
{
if (!this.query)
diff --git a/js/sql/table.js b/js/sql/table.js
index 82c141c9..578e5ea5 100644
--- a/js/sql/table.js
+++ b/js/sql/table.js
@@ -28,15 +28,11 @@ module.exports = new Class
,render: function ()
{
- var sql = '';
-
- if (this.schema)
- sql += this.renderIndentifier (this.schema) +'.';
-
- sql += this.renderIndentifier (this.name);
+ var sql = this.renderPreIdent (this.schema)
+ + this.renderIdent (this.name);
if (this.alias)
- sql += ' AS '+ this.renderIndentifier (this.alias);
+ sql += ' AS '+ this.renderIdent (this.alias);
return sql;
}
diff --git a/js/sql/update.js b/js/sql/update.js
index 8293fb15..26594e71 100644
--- a/js/sql/update.js
+++ b/js/sql/update.js
@@ -10,17 +10,18 @@ module.exports = new Class
,render: function (params)
{
- var sql = 'UPDATE '
+ var sql = 'UPDATE'
+ this.renderTarget (params)
+ ' SET ';
this.field.forEach (function (field, i) {
if (i > 0)
sql += ', ';
+
sql += field.render (params)
+ ' = '
+ this.expr[i].render(params);
- });
+ }, this);
sql += this.renderIfSet (this.where, 'WHERE', params)
+ this.renderLimit(params);
diff --git a/js/vn/builder.js b/js/vn/builder.js
index b4a136b4..38243733 100644
--- a/js/vn/builder.js
+++ b/js/vn/builder.js
@@ -6,9 +6,11 @@ var kebabToCamel = require ('./string-util').kebabToCamel;
var CompilerObject = require ('./compiler-object');
var CompilerElement = require ('./compiler-element');
var CompilerText = require ('./compiler-text');
+var CompilerString = require ('./compiler-string');
var CompilerInterpolable = require ('./compiler-interpolable');
var regCompilers = [
+ CompilerString,
CompilerObject,
CompilerElement,
CompilerText
diff --git a/js/vn/compiler-string.js b/js/vn/compiler-string.js
new file mode 100644
index 00000000..55d552cb
--- /dev/null
+++ b/js/vn/compiler-string.js
@@ -0,0 +1,23 @@
+
+var Compiler = require ('./compiler');
+
+/**
+ * Compiles a string from text node.
+ */
+module.exports = new Class
+({
+ Extends: Compiler
+
+ ,compile: function (builder, node, tagName)
+ {
+ if (tagName !== 'string')
+ return null;
+
+ return {string: node.firstChild.textContent};
+ }
+
+ ,instantiate: function (doc, context)
+ {
+ return context.string;
+ }
+});
diff --git a/js/vn/iterator.js b/js/vn/iterator.js
index d6b34b74..2896957d 100644
--- a/js/vn/iterator.js
+++ b/js/vn/iterator.js
@@ -78,15 +78,13 @@ module.exports = new Class
,rowChanged: function ()
{
- this._rowLock = true;
-
var row;
if (this._model)
row = this._model.getObject (this._row);
+ this._rowLock = true;
this.params = row != null ? row : {};
-
this._rowLock = false;
}
});
diff --git a/js/vn/model.js b/js/vn/model.js
index 2faa47b4..dd54e148 100644
--- a/js/vn/model.js
+++ b/js/vn/model.js
@@ -218,13 +218,17 @@ Klass.implement
,_sort: function (columnName, way)
{
+ var status = this._status;
this._setStatus (Status.LOADING);
this._realSort (columnName, way);
- this._setStatus (Status.READY);
+ this._setStatus (status);
}
,_realSort: function (columnName, way)
{
+ if (!this._data)
+ return;
+
if (columnName !== this._sortColumn)
{
if (way === SortWay.DESC)
diff --git a/js/vn/vn.js b/js/vn/vn.js
index f1e00697..1501c81d 100644
--- a/js/vn/vn.js
+++ b/js/vn/vn.js
@@ -21,6 +21,7 @@ Vn = module.exports = {
,ParamIface : require ('./param-iface')
,Param : require ('./param')
,Spec : require ('./spec')
+ ,Model : require ('./model')
,ModelIface : require ('./model-iface')
,ModelProxy : require ('./model-proxy')
,IteratorIface : require ('./iterator-iface')
{{item.Article}}
+{{item.name}}
{{item.producer}}
- @{{item.item_id}} + @{{item.id}}
- _Size {{item.Medida}} - _Category {{item.Categoria}} + _Size {{item.size}} + _Category {{item.category}}
- _Color {{item.color}}
-
{{item.available}}
-
- _from
-
+ _from
-
+
+ class="categories-box">
- SELECT r.id, l.str name, r.color
- FROM vn2008.reinos r
- LEFT JOIN vn_locale.realm_view l ON l.realm_id = r.id
- WHERE r.display != FALSE
- ORDER BY name
+ SELECT c.id, l.name, c.color
+ FROM vn.itemCategory c
+ JOIN vn.itemCategoryL10n l ON l.id = c.id
+ WHERE c.display > 0
+ ORDER BY l.name
-
+
-
-
+ result-index="1">
CALL item_available ();
- SELECT DISTINCT t.tipo_id, l.str name
- FROM vn2008.Tipos t
- JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id
- LEFT JOIN vn_locale.family_view l ON l.family_id = t.tipo_id
- JOIN tmp.item_available i ON i.item_id = a.Id_Article
- WHERE t.reino_id = #realm
+ SELECT DISTINCT t.id, l.name
+ FROM vn.itemType t
+ JOIN vn.item i ON i.typeFk = t.id
+ JOIN tmp.item_available a ON a.item_id = i.id
+ JOIN vn.itemTypeL10n l ON l.id = t.id
+ WHERE t.categoryFk = #category
ORDER BY name
-
-
_Choose a realm
+
+
+ _Order by
+
+
_Choose a category
_Filter by
-
_Order by
- -- {{card.Article}} + {{card.name}}
{{card.producer}}
- _Size {{card.Medida}}, - _Category {{card.categoria}} + _Size {{card.size}}, + _Category {{card.category}}
- _Color {{card.color}}
+ _Color {{card.inkFk}}
@@ -356,22 +307,4 @@