Menu
▾
▴
[Wonder-cvs] CVS: Wonder/DynaReporting/Frameworks/WRReporting/Components/Nonlocalized.lproj/WRReport.wo WRReport.html,1.2,1.3 WRReport.wod,1.2,1.3
|
From: Anjo K. <an...@us...> - 2003-03-28 13:51:47
|
Update of /cvsroot/wonder/Wonder/DynaReporting/Frameworks/WRReporting/Components/Nonlocalized.lproj/WRReport.wo
In directory sc8-pr-cvs1:/tmp/cvs-serv24834/WRReport.wo
Modified Files:
WRReport.html WRReport.wod
Log Message:
- added preliminary factoring of WRReport (not used yet)
- added preliminary LayoutEditor
Index: WRReport.html
===================================================================
RCS file: /cvsroot/wonder/Wonder/DynaReporting/Frameworks/WRReporting/Components/Nonlocalized.lproj/WRReport.wo/WRReport.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WRReport.html 16 Mar 2003 22:29:07 -0000 1.2
--- WRReport.html 28 Mar 2003 13:51:44 -0000 1.3
***************
*** 1,85 ****
<webobject name=editForm>
<webobject name=showPresentationControls>
! <webobject name=Custom1>
! <table border=0>
! <tr bgcolor=cccccc>
! <td valign=top>
! <table border=0>
! <tr bgcolor=999999>
! <td colspan=2><b><font size=2 face=arial,geneva>Record Grouping</font></b> </td>
! </tr>
! <tr>
! <td colspan=1><b><font size=2 face=arial,geneva>Record Group Display:</font></b> </td>
! <td colspan=2>
! <webobject name=recGrpDisplayList></webobject>
! </td>
! </tr>
! <tr>
! <td colspan=1><b><font size=2 face=arial,geneva>Report Style:</font></b> </td>
! <td colspan=2>
! <webobject name=reportStyle></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face=arial,geneva>Single Total to Show:</font></b> </td>
! <td>
! <webobject name=totToShow></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face="arial,geneva">Format for Single Total:</font></b></td>
! <td><webobject name=totToShow2></webobject></td>
! </tr><tr>
! <td><b><font size=2 face=arial,geneva>Show Attribute Headings:</font></b> </td>
! <td>
! <webobject name=showRGHeadings></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face=arial,geneva>Show Record Groups as Tables</font></b> </td>
! <td>
! <webobject name=showRGAsTable></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face=arial,geneva>Show Dimension Navigation</font></b> </td>
! <td>
! <webobject name=showNavigationCheck></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face=arial,geneva>Show Custom Report</font></b> </td>
! <td>
! <webobject name=showCustomCheck></webobject>
! </td>
! </tr>
! <tr>
! <td><b><font size=2 face="arial,geneva">Order</font></b></td>
! <td><b><font size=2 face="arial,geneva">V:
! <webobject name=keysInV></webobject>, H:
! <webobject name=keysInH></webobject>, Z:
! <webobject name=keysInZ></webobject></font></b></td>
! </tr><tr>
! <td colspan=2><font size=2 face=arial,geneva><webobject name=regenReport></webobject>
! </td>
! </tr>
! </table>
! </td>
! <td valign=top>
! <table border=0>
! <tr>
! <td colspan=3 bgcolor=999999><b><font size=2 face=arial,geneva>Dimension Group Totaling</font></b> </td>
! </tr>
! <webobject name=allGroups>
! <tr>
! <td colspan=1><b><font size=2 face=arial,geneva><webobject name=grpLabel></webobject></font></b> </td>
! <td colspan=2><webobject name=shouldTotalCheck></webobject></td>
! </tr>
! </webobject>
! </table>
! </td>
! </tr>
! </table>
! </webobject>
</webobject>
<table border=0 width=100% cellpadding=0 cellspacing=0>
--- 1,5 ----
<webobject name=editForm>
<webobject name=showPresentationControls>
! <webobject name=Custom1><webobject name=WRLayoutEditor1></webobject></webobject>
</webobject>
<table border=0 width=100% cellpadding=0 cellspacing=0>
***************
*** 105,109 ****
</webobject>
<webobject name=hCriteriaList>
! <webobject name=colSpanTd><b><font size=2 face=arial,geneva><webobject name=criteriaLabel></webobject></b></webobject>
</webobject>
</tr>
--- 25,29 ----
</webobject>
<webobject name=hCriteriaList>
! <webobject name=colSpanTd><b><font size=2 face=arial,geneva><webobject name=criteriaLabel></webobject></font></b></webobject>
</webobject>
</tr>
Index: WRReport.wod
===================================================================
RCS file: /cvsroot/wonder/Wonder/DynaReporting/Frameworks/WRReporting/Components/Nonlocalized.lproj/WRReport.wo/WRReport.wod,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WRReport.wod 16 Mar 2003 22:29:07 -0000 1.2
--- WRReport.wod 28 Mar 2003 13:51:44 -0000 1.3
***************
*** 1,9 ****
! Custom1: WOCollapsibleComponentContent { closedLabel = "Explode Layout"; openedLabel = "Collapse Layout";}
! Custom2: WOCollapsibleComponentContent { closedLabel = "Explode Navigation"; openedLabel = "Collapse Navigation";}
!
!
! allGroups:WORepetition{
! list = model.groups;
! item = aGrp;
}
attribHeading:WRAttributeGroup{
--- 1,20 ----
! Custom1: WOCollapsibleComponentContent { closedLabel = "Explode Layout"; openedLabel = "Collapse Layout"; condition = true;
! }
! Custom2: WOCollapsibleComponentContent { closedLabel = "Explode Navigation"; openedLabel = "Collapse Navigation";}
!
! WRLayoutEditor1: WRLayoutEditor {
! model = model;
! recordGroupTotalFormat = recordGroupTotalFormat;
! recordGroupTotalToShow = recordGroupTotalToShow;
! selectedRecordGroupDisplayType = selectedRecordGroupDisplayType;
! selectedReportStyle = selectedReportStyle;
! shouldTotalCheck = shouldTotalCheck;
! showCustomReportStyle = showCustomReportStyle;
! showNavigation = showNavigation;
! showRecordGroupHeadings = showRecordGroupHeadings;
! showRecordGroupAsTable = showRecordGroupAsTable;
! keysInH = ^keysInH;
! keysInV = ^keysInV;
! keysInZ = ^keysInZ;
}
attribHeading:WRAttributeGroup{
***************
*** 44,48 ****
}
dontshowDefaultReportStyle:WOConditional{
! condition= showDefaultReportStyleBool;
}
dontshowVerticalRows:WOConditional{
--- 55,59 ----
}
dontshowDefaultReportStyle:WOConditional{
! condition= showDefaultReportStyle;
}
dontshowVerticalRows:WOConditional{
***************
*** 57,66 ****
count= vheadingIndex;
}
- grpLabel:WOString{
- value = aGrp.masterCriteria.label;
- }
hCriteriaList: WRNestedList {
! list = topHorzGroupCriteriaList.@sort.score;
item = topCriteria;
index = currentIndex;
--- 68,74 ----
count= vheadingIndex;
}
hCriteriaList: WRNestedList {
! list = topHorzGroupCriteriaList;
item = topCriteria;
index = currentIndex;
***************
*** 80,96 ****
}
! horzDimensions: WORepetition { list= horzDimensions; item= hGroup;}
!
! keysInH: WOString {
! value = ^keysInH;
! }
!
! keysInV: WOString {
! value = ^keysInV;
! }
!
! keysInZ: WOString {
! value = ^keysInZ;
! }
numberOfCrits:WORepetition{
count = numberOfCrits;
--- 88,92 ----
}
! horzDimensions: WORepetition { list=horzDimensions; item=hGroup;}
numberOfCrits:WORepetition{
count = numberOfCrits;
***************
*** 98,109 ****
}
! recGrpDisplayList:WOPopUpButton{
! list = recordGroupDisplayTypes;
! item = dispType;
! value = dispType;
! selection = selectedRecordGroupDisplayType;
! }
!
! recordGroupTest:WRRecordGroup{
model = model;
recordGroup= recordGroupTest;
--- 94,99 ----
}
! recordGroupTest:WOSwitchComponent {
! WOComponentName = componentName;
model = model;
recordGroup= recordGroupTest;
***************
*** 117,130 ****
reportStyle = selectedReportStyle;
}
- regenReport:WOSubmitButton{
- action = regenReport;
- value = "Regenerate Report";
- }
- reportStyle:WOPopUpButton{
- list = reportStyles;
- item = areportStyle;
- value = areportStyle;
- selection = selectedReportStyle;
- }
rowSpanTd:WOGenericContainer{
elementName = "TD";
--- 107,110 ----
***************
*** 141,155 ****
colspan= depthCountAllAttribs;
}
- shouldTotalCheck:WOCheckBox{
- checked = shouldTotalCheck;
- }
-
- showCustomCheck:WOCheckBox{
- checked = showDefaultReportStyleBool;
- }
showDefaultReportStyle:WOConditional{
! condition= showDefaultReportStyleBool;
negate=true;
}
--- 121,128 ----
colspan= depthCountAllAttribs;
}
showDefaultReportStyle:WOConditional{
! condition= showDefaultReportStyle;
negate=true;
}
***************
*** 167,173 ****
condition= showIndentCell;
}
- showNavigationCheck:WOCheckBox{
- checked = showNavigation;
- }
showNoColNoRow:WOConditional{
condition= showNoColNoRow;
--- 140,143 ----
***************
*** 176,185 ****
condition = showPresentationControls;
}
- showRGAsTable:WOCheckBox{
- checked = showRGAsTable;
- }
- showRGHeadings:WOCheckBox{
- checked = showRGHeadings;
- }
showSingleCol:WOConditional{
condition= showSingleCol;
--- 146,149 ----
***************
*** 208,218 ****
colspan = colSpan;
rowspan = rowSpan;
- }
- totToShow:WOTextField{
- value = recordGroupTotalToShow;
- }
-
- totToShow2:WOTextField{
- value = recordGroupTotalFormat;
}
vCriteriaList: WRNestedList {
--- 172,175 ----
|