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

_onFormLoad does nothing if gui is not ready

This commit is contained in:
Juan Ferrer 2019-09-06 14:54:50 +02:00
parent 5fc168987d
commit 6cb13727a7
3 changed files with 209 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.406.63) stable; urgency=low hedera-web (1.406.64) stable; urgency=low
* Initial Release. * Initial Release.

201
js/hedera/gui.js
View File

@ -4,20 +4,15 @@ var Tpl = require ('./gui.xml');
require('./gui.css'); require('./gui.css');
module.exports = new Class module.exports = new Class({
({
Extends: Htk.Component, Extends: Htk.Component,
Properties: Properties: {
{ conn: {
conn:
{
type: Db.Connection type: Db.Connection
,set: function (x) ,set: function(x) {
{
this.link({_conn: x}, {'loading-changed': this._onConnLoadChange }); this.link({_conn: x}, {'loading-changed': this._onConnLoadChange });
} }
,get: function () ,get: function() {
{
return this._conn; return this._conn;
} }
} }
@ -34,21 +29,18 @@ module.exports = new Class
,_scrollTimeout: null ,_scrollTimeout: null
,_navbarVisible: true ,_navbarVisible: true
,initialize: function (props) ,initialize: function(props) {
{
this.builderInitString(Tpl); this.builderInitString(Tpl);
this.loadingCount = 0; this.loadingCount = 0;
this.$('background').onclick = function() {}; this.$('background').onclick = function() {};
this.$('menu-button').addEventListener ('click', function (event) this.$('menu-button').addEventListener('click', function(event) {
{
event.stopPropagation(); event.stopPropagation();
this.showMenu(); this.showMenu();
}.bind(this)); }.bind(this));
this.$('left-panel').addEventListener ('click', function (event) this.$('left-panel').addEventListener('click', function(event) {
{
event.stopPropagation(); event.stopPropagation();
}); });
@ -66,8 +58,7 @@ module.exports = new Class
this.loadMenu(); this.loadMenu();
} }
,show: function () ,show: function() {
{
if (this._shown) if (this._shown)
return; return;
@ -75,8 +66,7 @@ module.exports = new Class
this.doc.body.appendChild(this.node); this.doc.body.appendChild(this.node);
Htk.Toast.pushTop(this.$('form-holder')); Htk.Toast.pushTop(this.$('form-holder'));
if (Vn.isMobile ()) if (Vn.isMobile()) {
{
this._onScrollHandler = this._onScroll.bind(this); this._onScrollHandler = this._onScroll.bind(this);
window.addEventListener('scroll', this._onScrollHandler ); window.addEventListener('scroll', this._onScrollHandler );
} }
@ -85,8 +75,7 @@ module.exports = new Class
this.formParam = new Vn.HashParam({key: 'form'}); this.formParam = new Vn.HashParam({key: 'form'});
this.formParam.on('changed', this._onFormChange, this); this.formParam.on('changed', this._onFormChange, this);
if (!localStorage.getItem ('hederaCookies')) if (!localStorage.getItem('hederaCookies')) {
{
localStorage.setItem('hederaCookies', true); localStorage.setItem('hederaCookies', true);
Htk.Toast.showWarning(_('By using this site you accept cookies')); Htk.Toast.showWarning(_('By using this site you accept cookies'));
} }
@ -94,8 +83,7 @@ module.exports = new Class
this.supplantInit(); this.supplantInit();
} }
,hide: function () ,hide: function() {
{
if (!this._shown) if (!this._shown)
return; return;
@ -111,31 +99,26 @@ module.exports = new Class
Vn.Node.remove(this.node); Vn.Node.remove(this.node);
} }
,logout: function () ,logout: function() {
{
this.onLogoutClick(); this.onLogoutClick();
} }
,onLogoutClick: function () ,onLogoutClick: function() {
{
this._conn.close(this._onConnClose.bind(this)); this._conn.close(this._onConnClose.bind(this));
} }
,_onConnClose: function () ,_onConnClose: function() {
{
this.signalEmit('logout'); this.signalEmit('logout');
} }
,_onConnLoadChange: function (conn, isLoading) ,_onConnLoadChange: function(conn, isLoading) {
{
if (isLoading) if (isLoading)
this.loaderPush(); this.loaderPush();
else else
this.loaderPop(); this.loaderPop();
} }
,onMainQueryDone: function (resultSet) ,onMainQueryDone: function(resultSet) {
{
// Retrieving the user name // Retrieving the user name
var userName = resultSet.fetchValue(); var userName = resultSet.fetchValue();
@ -158,8 +141,7 @@ module.exports = new Class
var isTesting = !resultSet.fetchValue(); var isTesting = !resultSet.fetchValue();
if (isTesting) if (isTesting) {
{
this.$('dev-info').style.display = 'block'; this.$('dev-info').style.display = 'block';
this.$('version').textContent = Vn.Cookie.get('vnVersion'); this.$('version').textContent = Vn.Cookie.get('vnVersion');
} }
@ -168,15 +150,11 @@ module.exports = new Class
var res = resultSet.fetchResult(); var res = resultSet.fetchResult();
if (res.next () && res.get ('testDomain')) if (res.next() && res.get('testDomain')) {
{ if (location.host != res.get('productionDomain')) {
if (location.host != res.get ('productionDomain'))
{
var linkText = 'Old website'; var linkText = 'Old website';
var linkField = 'productionDomain'; var linkField = 'productionDomain';
} } else {
else
{
var linkText = 'Test the new website'; var linkText = 'Test the new website';
var linkField = 'testDomain'; var linkField = 'testDomain';
} }
@ -184,8 +162,7 @@ module.exports = new Class
Vn.Node.setText(this.$('test-link'), _(linkText)); Vn.Node.setText(this.$('test-link'), _(linkText));
this.$('test-link').href = '//'+ res.get(linkField); this.$('test-link').href = '//'+ res.get(linkField);
this.$('test-link').style.display = 'block'; this.$('test-link').style.display = 'block';
} } else
else
this.$('test-link').style.display = 'none'; this.$('test-link').style.display = 'none';
// Loading the default form // Loading the default form
@ -193,22 +170,19 @@ module.exports = new Class
this._onFormChange(); this._onFormChange();
} }
,loadMenu: function () ,loadMenu: function() {
{
var sql = 'SELECT * FROM myMenu'; var sql = 'SELECT * FROM myMenu';
this._conn.execQuery(sql, this._onMenuLoad.bind(this)); this._conn.execQuery(sql, this._onMenuLoad.bind(this));
} }
,_onMenuLoad: function (resultSet) ,_onMenuLoad: function(resultSet) {
{
// Retrieving menu sections // Retrieving menu sections
var res = resultSet.fetchResult(); var res = resultSet.fetchResult();
var sectionMap = {}; var sectionMap = {};
if (res) if (res)
for (var i = 0; res.next (); i++) for (var i = 0; res.next(); i++) {
{
var parent = res.get('parentFk'); var parent = res.get('parentFk');
if (!sectionMap[parent]) if (!sectionMap[parent])
@ -223,12 +197,10 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Menu //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Menu
,createMenu: function (res, sectionMap, parent, ul) ,createMenu: function(res, sectionMap, parent, ul) {
{
var sections = sectionMap[parent]; var sections = sectionMap[parent];
for (var i = 0; i < sections.length; i++) for (var i = 0; i < sections.length; i++) {
{
res.row = sections[i]; res.row = sections[i];
var li = this.createElement('li'); var li = this.createElement('li');
@ -238,8 +210,7 @@ module.exports = new Class
var a = this.createElement('a'); var a = this.createElement('a');
if (res.get ('path')) if (res.get('path')) {
{
a.href = Vn.Hash.make({'form': res.get('path')}); a.href = Vn.Hash.make({'form': res.get('path')});
this.menuOptions[res.get('path')] = a; this.menuOptions[res.get('path')] = a;
} }
@ -249,8 +220,7 @@ module.exports = new Class
var formId = res.get('id'); var formId = res.get('id');
if (sectionMap[formId]) if (sectionMap[formId]) {
{
var submenu = this.createElement('ul'); var submenu = this.createElement('ul');
submenu.className = 'submenu'; submenu.className = 'submenu';
li.appendChild(submenu); li.appendChild(submenu);
@ -265,8 +235,7 @@ module.exports = new Class
} }
} }
,_onLiMouseHover: function (submenu, parent) ,_onLiMouseHover: function(submenu, parent) {
{
if (this.menuShown) if (this.menuShown)
return; return;
@ -279,17 +248,14 @@ module.exports = new Class
submenu.style.top = rect.top +'px'; submenu.style.top = rect.top +'px';
} }
,_onLiMouseOut: function () ,_onLiMouseOut: function() {
{
this.timeout = setTimeout(this.hideSubmenu.bind(this), 160); this.timeout = setTimeout(this.hideSubmenu.bind(this), 160);
} }
,hideSubmenu: function () ,hideSubmenu: function() {
{
var submenu = this.activeSubmenu; var submenu = this.activeSubmenu;
if (submenu) if (submenu) {
{
Vn.Node.removeClass(submenu, 'popup'); Vn.Node.removeClass(submenu, 'popup');
submenu.style.left = ''; submenu.style.left = '';
submenu.style.top = ''; submenu.style.top = '';
@ -299,8 +265,7 @@ module.exports = new Class
} }
} }
,showMenu: function () ,showMenu: function() {
{
this.showBackground(); this.showBackground();
Vn.Node.addClass(this.$('left-panel'), 'show'); Vn.Node.addClass(this.$('left-panel'), 'show');
this.menuShown = true; this.menuShown = true;
@ -309,8 +274,7 @@ module.exports = new Class
this.doc.addEventListener('click', this.hideMenuCallback); this.doc.addEventListener('click', this.hideMenuCallback);
} }
,hideMenu: function () ,hideMenu: function() {
{
if (!this.menuShown) if (!this.menuShown)
return; return;
@ -324,15 +288,13 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Navigation bar //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Navigation bar
,_onScroll: function () ,_onScroll: function() {
{
if (this._scrollTimeout === null) if (this._scrollTimeout === null)
this._scrollTimeout = setTimeout( this._scrollTimeout = setTimeout(
this._scrollTimeoutFunc.bind(this), 150); this._scrollTimeoutFunc.bind(this), 150);
} }
,_scrollTimeoutFunc: function () ,_scrollTimeoutFunc: function() {
{
if (!this._shown) if (!this._shown)
return; return;
@ -340,8 +302,7 @@ module.exports = new Class
var yOffset = Vn.Browser.getPageYOffset(); var yOffset = Vn.Browser.getPageYOffset();
var showNavbar = this._lastYOffset > yOffset || yOffset < navbar.offsetHeight; var showNavbar = this._lastYOffset > yOffset || yOffset < navbar.offsetHeight;
if (showNavbar !== this._navbarVisible) if (showNavbar !== this._navbarVisible) {
{
if (showNavbar) if (showNavbar)
var translateY = 0; var translateY = 0;
else else
@ -358,28 +319,24 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Background //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Background
,showBackground: function () ,showBackground: function() {
{
Vn.Node.addClass(this.$('background'), 'show'); Vn.Node.addClass(this.$('background'), 'show');
} }
,hideBackground: function () ,hideBackground: function() {
{
Vn.Node.removeClass(this.$('background'), 'show'); Vn.Node.removeClass(this.$('background'), 'show');
} }
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Spinner //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Spinner
,loaderPush: function () ,loaderPush: function() {
{
this.loadingCount++; this.loadingCount++;
if (this.loadingCount == 1) if (this.loadingCount == 1)
this.$('loader').start(); this.$('loader').start();
} }
,loaderPop: function () ,loaderPop: function() {
{
if (this.loadingCount == 0) if (this.loadingCount == 0)
return; return;
@ -391,8 +348,7 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Forms //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Forms
,_onFormChange: function () ,_onFormChange: function() {
{
var formPath = this.formParam.value; var formPath = this.formParam.value;
if (!formPath) if (!formPath)
@ -402,8 +358,7 @@ module.exports = new Class
this._onFormLoad.bind(this)); this._onFormLoad.bind(this));
} }
,openForm: function (formPath, callback) ,openForm: function(formPath, callback) {
{
this.hideMenu(); this.hideMenu();
this.loaderPush(); this.loaderPush();
@ -412,8 +367,7 @@ module.exports = new Class
var newChoosedOption = this.menuOptions[formPath]; var newChoosedOption = this.menuOptions[formPath];
if (newChoosedOption) if (newChoosedOption) {
{
Vn.Node.addClass(newChoosedOption, 'selected'); Vn.Node.addClass(newChoosedOption, 'selected');
this.choosedOption = newChoosedOption; this.choosedOption = newChoosedOption;
} }
@ -423,8 +377,7 @@ module.exports = new Class
var formInfo = this.forms[formPath]; var formInfo = this.forms[formPath];
if (!formInfo) if (!formInfo) {
{
formInfo = new Module('forms', formPath); formInfo = new Module('forms', formPath);
this.forms[formPath] = formInfo; this.forms[formPath] = formInfo;
} }
@ -432,70 +385,59 @@ module.exports = new Class
formInfo.addCallback(callback); formInfo.addCallback(callback);
} }
,_onFormLoad: function (formInfo) ,_onFormLoad: function(formInfo) {
{
this.loaderPop(); this.loaderPop();
if (formInfo.error) if (formInfo.error)
{ return Htk.Toast.showError(_('Error loading form'));
Htk.Toast.showError (_('Error loading form')); if (!this._shown)
return; return;
}
this.activeForm = new formInfo.klass(this, formInfo); this.activeForm = new formInfo.klass(this, formInfo);
this.activeForm.open(); this.activeForm.open();
} }
,setForm: function (form) ,setForm: function(form) {
{
Vn.Node.removeChilds(this.$('form-holder')); Vn.Node.removeChilds(this.$('form-holder'));
if (form) if (form) {
{
this.$('form-holder').appendChild(form); this.$('form-holder').appendChild(form);
setTimeout(this._onSetFormTimeout.bind(this), 0); setTimeout(this._onSetFormTimeout.bind(this), 0);
} }
} }
,_onSetFormTimeout: function () ,_onSetFormTimeout: function() {
{
Vn.Node.addClass(this.$('form-holder'), 'show'); Vn.Node.addClass(this.$('form-holder'), 'show');
} }
,setTitle: function (title) ,setTitle: function(title) {
{
Vn.Node.removeChilds(this.$('title')); Vn.Node.removeChilds(this.$('title'));
if (title) if (title)
this.$('title').appendChild(title); this.$('title').appendChild(title);
} }
,setActions: function (actions) ,setActions: function(actions) {
{
Vn.Node.removeChilds(this.$('action-bar')); Vn.Node.removeChilds(this.$('action-bar'));
if (actions) if (actions)
this.$('action-bar').appendChild(actions); this.$('action-bar').appendChild(actions);
} }
,closeForm: function () ,closeForm: function() {
{ if (this.activeForm) {
if (this.activeForm)
{
Vn.Node.removeClass(this.$('form-holder'), 'show'); Vn.Node.removeClass(this.$('form-holder'), 'show');
this.activeForm.close(); this.activeForm.close();
this.activeForm.unref(); this.activeForm.unref();
this.activeForm = null; this.activeForm = null;
} }
if (this.activeCss) if (this.activeCss) {
{
Vn.excludeCss(this.activeCss); Vn.excludeCss(this.activeCss);
this.activeCss = null; this.activeCss = null;
} }
if (this.choosedOption) if (this.choosedOption) {
{
Vn.Node.removeClass(this.choosedOption, 'selected'); Vn.Node.removeClass(this.choosedOption, 'selected');
this.choosedOption = null; this.choosedOption = null;
} }
@ -503,20 +445,17 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Reports //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Reports
,openReport: function (reportName, batch) ,openReport: function(reportName, batch) {
{
this.loaderPush(); this.loaderPush();
var module = new Module('reports', reportName); var module = new Module('reports', reportName);
module.addCallback(this._onReportLoad.bind(this, batch)); module.addCallback(this._onReportLoad.bind(this, batch));
} }
,_onReportLoad: function (batch, module) ,_onReportLoad: function(batch, module) {
{
this.loaderPop(); this.loaderPop();
if (module.error) if (module.error) {
{
Htk.Toast.showError(_('Error loading report')); Htk.Toast.showError(_('Error loading report'));
return; return;
} }
@ -527,22 +466,19 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Supplant //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Supplant
,supplantInit: function () ,supplantInit: function() {
{
var user = sessionStorage.getItem('supplantUser'); var user = sessionStorage.getItem('supplantUser');
if (user != null) if (user != null)
this.supplantUser(user); this.supplantUser(user);
} }
,supplantUser: function (user, callback) ,supplantUser: function(user, callback) {
{
this._conn.supplantUser(user, this._conn.supplantUser(user,
this._onUserSupplant.bind(this, callback, user)); this._onUserSupplant.bind(this, callback, user));
} }
,_onUserSupplant: function (callback, user, supplantOk) ,_onUserSupplant: function(callback, user, supplantOk) {
{
if (!supplantOk) if (!supplantOk)
return; return;
@ -556,15 +492,13 @@ module.exports = new Class
callback(); callback();
} }
,_onSupplantName: function (resultSet) ,_onSupplantName: function(resultSet) {
{
var userName = resultSet.fetchValue(); var userName = resultSet.fetchValue();
Vn.Node.setText(this.$('supplanted'), userName); Vn.Node.setText(this.$('supplanted'), userName);
Vn.Node.show(this.$('supplant')); Vn.Node.show(this.$('supplant'));
} }
,onSupplantExitClick: function () ,onSupplantExitClick: function() {
{
Vn.Node.hide(this.$('supplant')); Vn.Node.hide(this.$('supplant'));
this._conn.supplantEnd(); this._conn.supplantEnd();
sessionStorage.removeItem('supplantUser', sessionStorage.removeItem('supplantUser',
@ -575,8 +509,7 @@ module.exports = new Class
//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Destroy //++++++++++++++++++++++++++++++++++++++++++++++++++++++ Destroy
,_destroy: function () ,_destroy: function() {
{
this.hide(); this.hide();
this.parent(); this.parent();
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "1.406.63", "version": "1.406.64",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {