oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Matrix fixes

Browse source
This commit is contained in:
Yung Han Khoe 2008-11-21 22:46:25 +00:00
parent cdb6ee7f84
commit 9eff3a4b77
3 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -932,11 +932,13 @@ assetData.revisionDate
",[$attributeId,$result->{assetId}]); ",[$attributeId,$result->{assetId}]);
$self->session->errorHandler->warn("fieldType:".$fieldType.", attributeValue: ".$form->process($param).", listingvalue: ".$listingValue); $self->session->errorHandler->warn("fieldType:".$fieldType.", attributeValue: ".$form->process($param).", listingvalue: ".$listingValue);
if(($fieldType eq 'MatrixCompare') && ($listingValue < $form->process($param))){ if(($fieldType eq 'MatrixCompare') && ($listingValue < $form->process($param))){
undef $result->{checked}; #undef $result->{checked};
$result->{checked} = '';
last; last;
} }
elsif(($fieldType ne 'MatrixCompare') && ($form->process($param) ne $listingValue)){ elsif(($fieldType ne 'MatrixCompare') && ($form->process($param) ne $listingValue)){
undef $result->{checked}; #undef $result->{checked};
$result->{checked} = '';
last; last;
} }
else{ else{
@ -954,12 +956,12 @@ assetData.revisionDate
} }
$result->{assetId} =~ s/-/_____/g; $result->{assetId} =~ s/-/_____/g;
$result->{url} = "/".$result->{url}; $result->{url} = "/".$result->{url};
$result->{checkBox} = "<input type='checkbox' name='listingId' value='".$result->{assetId} #$result->{checkBox} = "<input type='checkbox' name='listingId' value='".$result->{assetId}
."' id='".$result->{assetId}."_checkBox' "; # ."' id='".$result->{assetId}."_checkBox' ";
if($result->{checked}){ #if($result->{checked}){
$result->{checkBox} .= " checked='checked'"; # $result->{checkBox} .= " checked='checked'";
} #}
$result->{checkBox} .= " onChange='javascript:compareFormButton()' class='compareCheckBox'>"; #$result->{checkBox} .= " onChange='javascript:compareFormButton()' class='compareCheckBox'>";
} }
my $jsonOutput; my $jsonOutput;
@ -1118,6 +1120,7 @@ sub www_search {
$attribute->{extras} = " class='attributeSelect'"; $attribute->{extras} = " class='attributeSelect'";
if($attribute->{fieldType} eq 'Combo'){ if($attribute->{fieldType} eq 'Combo'){
$attribute->{fieldType} = 'SelectBox'; $attribute->{fieldType} = 'SelectBox';
$attribute->{options} = "blank\n".$attribute->{options};
} }
$attribute->{form} = WebGUI::Form::DynamicField->new($self->session,%{$attribute})->toHtml; $attribute->{form} = WebGUI::Form::DynamicField->new($self->session,%{$attribute})->toHtml;
push(@attribute_loop,$attribute); push(@attribute_loop,$attribute);

25
www/extras/wobject/Matrix/matrix.js
View file

@ -3,9 +3,17 @@ YAHOO.util.Event.addListener(window, "load", function() {
this.formatUrl = function(elCell, oRecord, oColumn, sData) { this.formatUrl = function(elCell, oRecord, oColumn, sData) {
elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>"; elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>";
}; };
this.formatCheckBox = function(elCell, oRecord, oColumn, sData) {
var innerHTML = "<input type='checkbox' name='listingId' value='" + sData + "' id='" + sData + "_checkBox'";
if(typeof(oRecord.getData("checked")) != 'undefined' && oRecord.getData("checked") == 'checked'){
innerHTML = innerHTML + " checked='checked'";
}
innerHTML = innerHTML + " onchange='javascript:compareFormButton()' class='compareCheckBox'>";
elCell.innerHTML = innerHTML;
};
var myColumnDefs = [ var myColumnDefs = [
{key:"checkBox",label:"",sortable:false}, {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox},
{key:"title", label:"Name", sortable:true, formatter:this.formatUrl}, {key:"title", label:"Name", sortable:true, formatter:this.formatUrl},
{key:"views", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, {key:"views", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}},
{key:"clicks", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, {key:"clicks", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}},
@ -25,7 +33,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
this.myDataSource.connXhrMode = "queueRequests"; this.myDataSource.connXhrMode = "queueRequests";
this.myDataSource.responseSchema = { this.myDataSource.responseSchema = {
resultsList: "ResultSet.Result", resultsList: "ResultSet.Result",
fields: ["title","views","clicks","compares","checkBox","checked","lastUpdated","url"] fields: ["title","views","clicks","compares","checked","lastUpdated","url","assetId"]
}; };
this.myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs, this.myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs,
@ -66,12 +74,16 @@ YAHOO.util.Event.addListener(window, "load", function() {
window.document.forms['doCompare'].submit(); window.document.forms['doCompare'].submit();
},this,true); },this,true);
window.compareDataTable = this.myDataTable;
window.compareFormButton = function() { window.compareFormButton = function() {
var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input'); var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input');
var checked = 0; var checked = 0;
var checkedCompareBoxes = new Object();
for (var i = compareCheckBoxes.length; i--; ) { for (var i = compareCheckBoxes.length; i--; ) {
if(compareCheckBoxes[i].checked){ if(compareCheckBoxes[i].checked){
checked++; checked++;
checkedCompareBoxes[compareCheckBoxes[i].value] = true;
} }
} }
if (checked > 1 && checked < maxComparisons){ if (checked > 1 && checked < maxComparisons){
@ -79,6 +91,15 @@ YAHOO.util.Event.addListener(window, "load", function() {
}else{ }else{
btnCompare.set("disabled",true); btnCompare.set("disabled",true);
} }
var elements = window.compareDataTable.getRecordSet().getRecords();
for(j=0; j<elements.length; j++){
var assetId = elements[j].getData('assetId');
if(assetId in checkedCompareBoxes){
elements[j].setData('checked','checked');
}else{
elements[j].setData('checked',null);
}
}
} }
}; };
}); });

16
www/extras/wobject/Matrix/matrixSearch.js
View file

@ -5,9 +5,17 @@ YAHOO.util.Event.addListener(window, "load", function() {
this.formatUrl = function(elCell, oRecord, oColumn, sData) { this.formatUrl = function(elCell, oRecord, oColumn, sData) {
elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>"; elCell.innerHTML = "<a href='" + oRecord.getData("url") + "' target='_blank'>" + sData + "</a>";
}; };
this.formatCheckBox = function(elCell, oRecord, oColumn, sData) {
var innerHTML = "<input type='checkbox' name='listingId' value='" + sData + "' id='" + sData + "_checkBox'";
if(typeof(oRecord.getData("checked")) != 'undefined' && oRecord.getData("checked") == 'checked'){
innerHTML = innerHTML + " checked='checked'";
}
innerHTML = innerHTML + " onchange='javascript:compareFormButton()' class='compareCheckBox'>";
elCell.innerHTML = innerHTML;
};
var myColumnDefs = [ var myColumnDefs = [
{key:"checkBox",label:""}, {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox},
{key:"title", label:"Name", sortable:true, formatter:this.formatUrl}, {key:"title", label:"Name", sortable:true, formatter:this.formatUrl},
{key:"views", sortable:true}, {key:"views", sortable:true},
{key:"clicks", sortable:true}, {key:"clicks", sortable:true},
@ -26,7 +34,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
this.myDataSource.connXhrMode = "queueRequests"; this.myDataSource.connXhrMode = "queueRequests";
this.myDataSource.responseSchema = { this.myDataSource.responseSchema = {
resultsList: "ResultSet.Result", resultsList: "ResultSet.Result",
fields: ["title","views","clicks","compares","checkBox","checked","url"] fields: ["title","views","clicks","compares","checked","url","assetId"]
}; };
var myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs, var myDataTable = new YAHOO.widget.DataTable("compareForm", myColumnDefs,
@ -55,7 +63,9 @@ YAHOO.util.Event.addListener(window, "load", function() {
var attributeSelects = YAHOO.util.Dom.getElementsByClassName('attributeSelect','select'); var attributeSelects = YAHOO.util.Dom.getElementsByClassName('attributeSelect','select');
var newUri = "func=getCompareFormData;search=1"; var newUri = "func=getCompareFormData;search=1";
for (var i = attributeSelects.length; i--; ) { for (var i = attributeSelects.length; i--; ) {
newUri = newUri + ';search_' + attributeSelects[i].id + '=' + attributeSelects[i].value; if(attributeSelects[i].value != 'blank'){
newUri = newUri + ';search_' + attributeSelects[i].id + '=' + attributeSelects[i].value;
}
} }
myDataTable.getRecordSet().reset(); myDataTable.getRecordSet().reset();
myDataTable.refreshView(); myDataTable.refreshView();