diff --git a/workflow/engine/xmlform/setup/calendarEdit.xml b/workflow/engine/xmlform/setup/calendarEdit.xml
index 329c857e0..1781cd437 100644
--- a/workflow/engine/xmlform/setup/calendarEdit.xml
+++ b/workflow/engine/xmlform/setup/calendarEdit.xml
@@ -6,93 +6,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -104,269 +29,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
'+startHourMessage+'
'+endHourMessage,'alert');
+ if (invalidCalendarName!=''){
+ invalidNameMessage = '@G::LoadTranslation(ID_INVALID_NAME)';
+ }
+ msgBox(invalidNameMessage+'
'+startHourMessage+'
'+endHourMessage,'alert');
}
}
-function number_row(){
+function number_row(){
iRows = Number_Rows_Grid('BUSINESS_DAY','CALENDAR_BUSINESS_START');
return iRows;
}
@@ -453,7 +143,7 @@ function cleargrid(){
return false;
}
-leimnud.event.add(getField("BUSINESS_DAY_STATUS"), 'click', function() {
+leimnud.event.add(getField("BUSINESS_DAY_STATUS"), 'click', function() {
if(getField("BUSINESS_DAY_STATUS").checked){
document.getElementById('gridbusiness').style.display="";
getField("CALENDAR_WORK_DAYS][0").disabled=true;
@@ -565,7 +255,7 @@ function check() {
if(getField("CALENDAR_WORK_DAYS][6").checked){
Text='SAT';
Value=6;
- AddItem(Text,Value);
+ AddItem(Text,Value);
}
if((getField("CALENDAR_WORK_DAYS][0").checked==false)&&(getField("CALENDAR_WORK_DAYS][1").checked==false)&&(getField("CALENDAR_WORK_DAYS][2").checked==false)&&(getField("CALENDAR_WORK_DAYS][3").checked==false)&&(getField("CALENDAR_WORK_DAYS][4").checked==false)&&(getField("CALENDAR_WORK_DAYS][5").checked==false)&&(getField("CALENDAR_WORK_DAYS][6").checked==false)){
@@ -581,7 +271,7 @@ leimnud.event.add(getField("CALENDAR_WORK_DAYS][4"), 'click', function() {check(
leimnud.event.add(getField("CALENDAR_WORK_DAYS][5"), 'click', function() {check();});
leimnud.event.add(getField("CALENDAR_WORK_DAYS][6"), 'click', function() {check();});
-
+
var dynaformOnload = function() {
rowsCount=Number_Rows_Grid("BUSINESS_DAY", "CALENDAR_BUSINESS_DAY");
@@ -624,7 +314,7 @@ function timeValidatorWrap(iRow){
getGridField("BUSINESS_DAY", iRow, "CALENDAR_BUSINESS_START").onchange=function startValidation(){
validateTime(getGridField("BUSINESS_DAY", iRow, "CALENDAR_BUSINESS_START"));
}
-
+
getGridField("BUSINESS_DAY", iRow, "CALENDAR_BUSINESS_START").onblur=function startValidation(){
validateTime(getGridField("BUSINESS_DAY", iRow, "CALENDAR_BUSINESS_START"));
}
@@ -636,17 +326,17 @@ function timeValidatorWrap(iRow){
validateTime(getGridField("BUSINESS_DAY", iRow, "CALENDAR_BUSINESS_END"));
}
-
-
+
+
}
function validateForm(form){
rowsCount=Number_Rows_Grid("BUSINESS_DAY", "CALENDAR_BUSINESS_DAY");
msg="";
-
- for(i=1;i<=rowsCount;i++){
- msgStart="";
+
+ for(i=1;i<=rowsCount;i++){
+ msgStart="";
msgStart=validateTime(getGridField("BUSINESS_DAY", i, "CALENDAR_BUSINESS_START"));
-
+
if(msgStart!=""){
msg+="- "+msgStart+"\n";
}
@@ -655,10 +345,10 @@ function validateForm(form){
if(msgEnd!=""){
msg+="- "+msgEnd+"\n";
}
-
+
}
getField('CALENDAR_NAME').value=getField('CALENDAR_NAME').value.trim();
- if(getField('CALENDAR_NAME').value==""){
+ if(getField('CALENDAR_NAME').value==""){
msg+="- Invalid Name \n";
}
var flag=true;
@@ -678,13 +368,13 @@ function validateForm(form){
alert(msg);
return false;
}
-
+
return true;
}
function validateTime(object){
- timeToValidate=object.value;
+ timeToValidate=object.value;
msgError="";
if(!isValidTime(timeToValidate)){
G.highLight(object);
@@ -715,32 +405,27 @@ function isValidTime(value) {
}
function cancel(){
-
+
window.location = 'calendarList';
}
-leimnud.event.add(getField("CALENDAR_NAME"), 'change', function() {
+function validateCalendarName(){
+ var validateMessage = '';
var oRPC = new leimnud.module.rpc.xmlhttp({
- url : 'calendarValidate',
- args: 'action=calendarName&name='+getField("CALENDAR_NAME").value
+ url : 'calendarValidate',
+ async : false,
+ args : 'action=calendarName&name='+getField("CALENDAR_NAME").value
});
- oRPC.callback = function(rpc){
- var scs = rpc.xmlhttp.responseText;
- if (scs != ''){
- //notValidFields['CALENDAR_NAME'] = scs;
- invalidCalendarName = scs;
- msgBox(scs,'alert');
- } else {
- invalidCalendarName = '';
- }
- }.extend(this);
oRPC.make();
-});
+ validateMessage=oRPC.xmlhttp.responseText;
+ if (validateMessage!=''){
+ G.highLight(getField("CALENDAR_NAME"));
+ } else {
+ getField("CALENDAR_NAME").style.background="";
+ }
+ return (validateMessage);
+}
-<<<<<<< .mine
-]]>
-
-=======
function validateHours(){
var fields = new Array();
var invalidStartHours = new Array();
@@ -766,13 +451,7 @@ function validateHours(){
fields['CALENDAR_BUSINESS_START'] = invalidStartHours;
fields['CALENDAR_BUSINESS_END'] = invalidEndHours;
return (fields);
- //getGridField(string grid_name,int row_number,string field_name)
- /*for (var i in gridForm){
- alert(gridForm[i].CALENDAR_BUSINESS_DAY);
- }*/
}
-
]]>
-
->>>>>>> .r125
+