|
@@ -11,7 +11,6 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
this.form.subformLoadedCount = 1
|
|
this.form.subformLoadedCount = 1
|
|
|
}
|
|
}
|
|
|
this.form.checkSubformLoaded();
|
|
this.form.checkSubformLoaded();
|
|
|
- this.checked = true;
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
|
|
|
|
this.getSubform(function () {
|
|
this.getSubform(function () {
|
|
@@ -19,18 +18,18 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
}.bind(this));
|
|
}.bind(this));
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- active: function ( callback ) {
|
|
|
|
|
|
|
+ active: function (callback) {
|
|
|
if (!this.loaded) {
|
|
if (!this.loaded) {
|
|
|
- this.reload( callback )
|
|
|
|
|
- }else{
|
|
|
|
|
- if(callback)callback();
|
|
|
|
|
|
|
+ this.reload(callback)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ if (callback) callback();
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- reload: function ( callback ) {
|
|
|
|
|
|
|
+ reload: function (callback) {
|
|
|
this.node.empty();
|
|
this.node.empty();
|
|
|
this.getSubform(function () {
|
|
this.getSubform(function () {
|
|
|
this.loadSubform();
|
|
this.loadSubform();
|
|
|
- if(callback)callback();
|
|
|
|
|
|
|
+ if (callback) callback();
|
|
|
}.bind(this));
|
|
}.bind(this));
|
|
|
},
|
|
},
|
|
|
loadCss: function () {
|
|
loadCss: function () {
|
|
@@ -68,21 +67,20 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
styleNode.appendChild(cssTextNode);
|
|
styleNode.appendChild(cssTextNode);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- ,
|
|
|
|
|
|
|
+ },
|
|
|
checkSubformNested: function (id) {
|
|
checkSubformNested: function (id) {
|
|
|
|
|
+ if (!id) return true;
|
|
|
if (this.parentformIdList) {
|
|
if (this.parentformIdList) {
|
|
|
return !this.parentformIdList.contains(id);
|
|
return !this.parentformIdList.contains(id);
|
|
|
} else {
|
|
} else {
|
|
|
return ![this.form.json.id].contains(id);
|
|
return ![this.form.json.id].contains(id);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- ,
|
|
|
|
|
|
|
+ },
|
|
|
checkSubformUnique: function (id) {
|
|
checkSubformUnique: function (id) {
|
|
|
- if (!this.form.subformLoaded)return true;
|
|
|
|
|
|
|
+ if (!id) return true;
|
|
|
|
|
+ if (!this.form.subformLoaded) return true;
|
|
|
return !this.form.subformLoaded.contains(id);
|
|
return !this.form.subformLoaded.contains(id);
|
|
|
- }
|
|
|
|
|
- ,
|
|
|
|
|
|
|
+ },
|
|
|
getParentformIdList: function () {
|
|
getParentformIdList: function () {
|
|
|
var parentformIdList;
|
|
var parentformIdList;
|
|
|
if (this.parentformIdList) {
|
|
if (this.parentformIdList) {
|
|
@@ -92,8 +90,7 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
parentformIdList = [this.form.json.id, this.subformData.json.id];
|
|
parentformIdList = [this.form.json.id, this.subformData.json.id];
|
|
|
}
|
|
}
|
|
|
return parentformIdList;
|
|
return parentformIdList;
|
|
|
- }
|
|
|
|
|
- ,
|
|
|
|
|
|
|
+ },
|
|
|
loadSubform: function () {
|
|
loadSubform: function () {
|
|
|
if (this.subformData) {
|
|
if (this.subformData) {
|
|
|
if (!this.checkSubformNested(this.subformData.json.id)) {
|
|
if (!this.checkSubformNested(this.subformData.json.id)) {
|
|
@@ -158,11 +155,11 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
if (typeOf(data) === "string") {
|
|
if (typeOf(data) === "string") {
|
|
|
formName = data;
|
|
formName = data;
|
|
|
} else {
|
|
} else {
|
|
|
- if (data.application)app = data.application;
|
|
|
|
|
- if (data.subform)formName = data.subform;
|
|
|
|
|
|
|
+ if (data.application) app = data.application;
|
|
|
|
|
+ if (data.subform) formName = data.subform;
|
|
|
}
|
|
}
|
|
|
if (formName) {
|
|
if (formName) {
|
|
|
- if (!app)app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
|
|
|
|
|
|
|
+ if (!app) app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
|
|
|
MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
|
|
MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
|
|
|
this.getSubformData(json.data);
|
|
this.getSubformData(json.data);
|
|
|
if (callback) callback();
|
|
if (callback) callback();
|
|
@@ -177,10 +174,10 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
} else {
|
|
} else {
|
|
|
if (this.json.subformSelected && this.json.subformSelected !== "none") {
|
|
if (this.json.subformSelected && this.json.subformSelected !== "none") {
|
|
|
var subformData = (this.form.app.relatedFormMap) ? this.form.app.relatedFormMap[this.json.subformSelected] : null;
|
|
var subformData = (this.form.app.relatedFormMap) ? this.form.app.relatedFormMap[this.json.subformSelected] : null;
|
|
|
- if (subformData){
|
|
|
|
|
|
|
+ if (subformData) {
|
|
|
this.getSubformData({"data": subformData.data});
|
|
this.getSubformData({"data": subformData.data});
|
|
|
if (callback) callback();
|
|
if (callback) callback();
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
var app;
|
|
var app;
|
|
|
if (this.json.subformAppSelected) {
|
|
if (this.json.subformAppSelected) {
|
|
|
app = this.json.subformAppSelected;
|
|
app = this.json.subformAppSelected;
|
|
@@ -198,7 +195,7 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
getSubformData: function (data) {
|
|
getSubformData: function (data) {
|
|
|
- if (!data || typeOf(data) !== "object")return;
|
|
|
|
|
|
|
+ if (!data || typeOf(data) !== "object") return;
|
|
|
var subformDataStr = null;
|
|
var subformDataStr = null;
|
|
|
// if ( this.form.json.mode !== "Mobile" && !layout.mobile){
|
|
// if ( this.form.json.mode !== "Mobile" && !layout.mobile){
|
|
|
// subformDataStr = data.data;
|
|
// subformDataStr = data.data;
|
|
@@ -304,11 +301,11 @@ MWF.xApplication.process.Xform.SubmitForm = MWF.APPSubmitform = new Class({
|
|
|
if (typeOf(data) === "string") {
|
|
if (typeOf(data) === "string") {
|
|
|
formName = data;
|
|
formName = data;
|
|
|
} else {
|
|
} else {
|
|
|
- if (data.application)app = data.application;
|
|
|
|
|
- if (data.form)formName = data.form;
|
|
|
|
|
|
|
+ if (data.application) app = data.application;
|
|
|
|
|
+ if (data.form) formName = data.form;
|
|
|
}
|
|
}
|
|
|
if (formName) {
|
|
if (formName) {
|
|
|
- if (!app)app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
|
|
|
|
|
|
|
+ if (!app) app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
|
|
|
MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
|
|
MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
|
|
|
this.getSubformData(json.data);
|
|
this.getSubformData(json.data);
|
|
|
if (callback) callback();
|
|
if (callback) callback();
|