Changeset 13360 in main


Ignore:
Timestamp:
03/09/17 20:16:38 (5 years ago)
Author:
Garth Braithwaite
Message:

admin, java - tweaked ui to have ip list link on admin ip menu. Publishing work.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/_menu_items.jsp

    r13348 r13360  
    1616<li>
    1717        <input id ="ExpandableListInputControl.indicatorMenu" type="checkbox" title="Show/hide admin nav menu">
    18         <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance.">Indicator Menu</label>
     18        <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance."
     19                onclick="requestPage('edit/indicator/list')" class="Link"
     20        >Indicator Menu</label>
    1921        <ul>
    2022
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/_menu_items.jsp

    r13348 r13360  
    1414<li>
    1515        <input id ="ExpandableListInputControl.indicatorMenu" type="checkbox" title="Show/hide admin nav menu">
    16         <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance.">Indicator Menu</label>
     16        <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance."
     17                onclick="requestPage('edit/indicator/list')" class="Link"
     18        >Indicator Menu</label>
    1719        <ul>
    1820
  • trunk/ibisph-admin/src/main/webapp/css/_layout.css

    r13328 r13360  
    157157#navigationMenu ul li:hover input + label
    158158{
    159         background-color:       #336699;
     159        background-color:       #003366;
    160160        background-image:       none;
    161161}
     162#navigationMenu ul li input + label.Link:hover
     163{
     164        color:                          #ffcc66;
     165        cursor:                         pointer;
     166}
     167       
    162168
    163169
  • trunk/ibisph/src/main/java/org/ibisph/databean/DataBeanToXMLService.java

    r6920 r13360  
    88import org.dom4j.Node;
    99
     10import org.ibisph.databean.dao.DataBeanDAOService;
    1011import org.ibisph.util.StrLib;
    1112import org.ibisph.util.StringCleaner;
     
    2829  protected DateFormat dateFormat = new SimpleDateFormat();
    2930
     31  // properties that are not used directly in this code but used by subclasses.
     32  protected String dataBeanFlagValue = "x";
     33  protected DataBeanDAOService dataBeanDAOService;
     34
    3035
    3136  //=========================================================== S E T T E R S
     
    7075  public void setStringCleaner(StringCleaner stringCleaner) {
    7176    this.stringCleaner = stringCleaner;
     77  } //-------------------------- End of Method ------------------------------
     78
     79
     80  /**
     81   * Flag value used to specify the _FLAG type RDBMS record field value.
     82   * @param dataBeanFlagValue value used in the db table which typically
     83   *   indicates that the record is active or is a period etc.
     84   */
     85  public void setDataBeanFlagValue(String dataBeanFlagValue) {
     86    this.dataBeanFlagValue = dataBeanFlagValue;
     87  } //-------------------------- End of Method ------------------------------
     88
     89  /**
     90   * Sets the bean DAO service/loader used to load the beans.
     91   */
     92  public void setDataBeanDAOService(DataBeanDAOService dataBeanDAOService) {
     93    this.dataBeanDAOService = dataBeanDAOService;
    7294  } //-------------------------- End of Method ------------------------------
    7395
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDataBeanToXML.java

    r13348 r13360  
    1818 */
    1919public class IndicatorDataBeanToXML extends DataBeanToXMLService {
    20   protected String dataBeanActiveFlagValue = "x";
    2120
    2221  protected Collection<Relation> relationDataBeanCollection = null;
    23 
    24   protected org.ibisph.databean.dao.DataBeanDAOService dataBeanDAOService;
    25 
    26 
    27   /**
    28    * Active Flag value used to specify that the RDBMS record is currently being
    29    * used.
    30    * @param dataBeanActiveFlagValue value used in the db table which indicates
    31    *   that the record is active.
    32    */
    33   public void setDataBeanActiveFlagValue(String dataBeanActiveFlagValue) {
    34     this.dataBeanActiveFlagValue = dataBeanActiveFlagValue;
    35   } //-------------------------- End of Method ------------------------------
    3622
    3723  /**
     
    4228    this.relationDataBeanCollection = (Collection<Relation>)relationDataBeanCollection;
    4329  } //-------------------------- End of Method ------------------------------
    44 
    45   /**
    46    * Sets the bean DAO service/loader used to load the beans.
    47    */
    48   public void setDataBeanDAOService(org.ibisph.databean.dao.DataBeanDAOService dataBeanDAOService) {
    49     this.dataBeanDAOService = dataBeanDAOService;
    50   } //-------------------------- End of Method ------------------------------
    51 
    5230
    5331  /**
     
    148126      Topic topic = new Topic();
    149127      topic.setFieldValue("NAME",        topicIndicator.getTopicName());
    150       topic.setFieldValue("ACTIVE_FLAG", this.dataBeanActiveFlagValue);
     128      topic.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
    151129      if(this.dataBeanDAOService.load(topic) > 0) {
    152 //        Node topicElement = XMLLib.newNode("TOPIC");
    153         addDataBeanToNode(topicsElement, topic);
     130        Node topicElement = newNode("TOPIC", topic);
     131        XMLLib.addNode(topicsElement, topicElement);
    154132      }
    155133    }
     
    183161      // flag that is set to true when data exists so that the code knows if it
    184162      // needs to add the element or not.
    185       boolean addIndicatorRelationElement = false; 
     163      boolean indicatorRelationElementExists = false;
    186164      IndicatorToRelation indicatorRelation = new IndicatorToRelation();
    187165      indicatorRelation.setFieldValue("INDICATOR_NAME", indicator.getName());
     
    189167      if(this.dataBeanDAOService.load(indicatorRelation) > 0) {
    190168        XMLLib.addNode(indicatorRelationElement, XMLLib.newNode("TEXT", indicatorRelation.getText() ) );
    191         addIndicatorRelationElement = indicatorRelation.getText().trim().length() > 0;
     169        indicatorRelationElementExists = indicatorRelation.getText().trim().length() > 0;
    192170      }
    193171
    194172      // next add the related indicators - if the collection contains something.
    195173      ArrayList<DataBean> relatedIndicatorCollection = new ArrayList<DataBean>();
    196       IndicatorToIndicator relatedIndicator   = new IndicatorToIndicator();
     174      IndicatorToIndicator relatedIndicator = new IndicatorToIndicator();
    197175      relatedIndicator.setFieldValue("INDICATOR_NAME", indicator.getName());
    198176      relatedIndicator.setFieldValue("RELATION_NAME",  relation.getName());
    199177      if(this.dataBeanDAOService.load(relatedIndicatorCollection, relatedIndicator) > 0) {
    200         addIndicatorRelationElement = true;
    201         relatedIndicatorsElement     = XMLLib.newNode("RELATED_INDICATORS");
     178        indicatorRelationElementExists = true;
     179        relatedIndicatorsElement = XMLLib.newNode("RELATED_INDICATORS");
    202180
    203181        for(int j=0; j<relatedIndicatorCollection.size(); j++) {
     
    220198      }
    221199
    222       if(addIndicatorRelationElement) XMLLib.addNode(relationsElement, indicatorRelationElement);
     200      if(indicatorRelationElementExists) XMLLib.addNode(relationsElement, indicatorRelationElement);
    223201    }
    224202
     
    243221    IndicatorView indicatorView = new IndicatorView();
    244222    indicatorView.setFieldValue("INDICATOR_NAME", indicator.getName());
    245     indicatorView.setFieldValue("ACTIVE_FLAG",    this.dataBeanActiveFlagValue);
     223    indicatorView.setFieldValue("ACTIVE_FLAG",    this.dataBeanFlagValue);
    246224    this.dataBeanDAOService.load(indicatorViewCollection, indicatorView, new String[] {"SORT_ORDER", "TITLE"});
    247225
     
    252230      XMLLib.addNode(indicatorViewElement, XMLLib.newNode("NAME",         indicatorView.getName()) );
    253231      XMLLib.addNode(indicatorViewElement, XMLLib.newNode("TITLE",        indicatorView.getTitle()) );
    254 // TODO:
     232// TODO: possibly need to get the PERIOD, SERIES, CATEGORY dim titles???
    255233/*
    256234XMLLib.addNode(indicatorViewElement, XMLLib.newNode("SUB_TITLE",    indicatorView.getSubTitle()) );
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDatasetDataBeanToXML.java

    r11741 r13360  
    66import org.ibisph.databean.DataBean;
    77import org.ibisph.databean.DataBeanToXMLService;
    8 import org.ibisph.databean.dao.DataBeanDAOService;
    9 import org.ibisph.indicatorprofile.databean.Chart;
    10 import org.ibisph.indicatorprofile.databean.DataSource;
    11 import org.ibisph.indicatorprofile.databean.Dimension;
    12 import org.ibisph.indicatorprofile.databean.DimensionValue;
    13 import org.ibisph.indicatorprofile.databean.IndicatorView;
    14 import org.ibisph.indicatorprofile.databean.DataSourceToDataset;
    15 import org.ibisph.indicatorprofile.databean.IndicatorViewSavedQuery;
    16 import org.ibisph.indicatorprofile.databean.DatasetRecord;
    17 import org.ibisph.indicatorprofile.databean.Map;
    18 import org.ibisph.indicatorprofile.databean.Measure;
    19 import org.ibisph.indicatorprofile.databean.MeasureValue;
    20 import org.ibisph.indicatorprofile.databean.ValueType;
     8import org.ibisph.indicatorprofile.databean.*;
    219import org.ibisph.util.XMLLib;
    2210
     
    2816 */
    2917public class IndicatorDatasetDataBeanToXML extends DataBeanToXMLService {
    30   protected String dataBeanFlagValue = "x";
    31 
    32   protected DataBeanDAOService dataDataBeanDAOService;
    33 
    34 
    35   /**
    36    * Flag value used to specify the _FLAG type RDBMS record field value.
    37    * @param dataBeanFlagValue value used in the db table which typically
    38    *   indicates that the record is active or is a period etc.
    39    */
    40   public void setDataBeanFlagValue(String dataBeanFlagValue) {
    41     this.dataBeanFlagValue = dataBeanFlagValue;
    42   } //-------------------------- End of Method ------------------------------
    43 
    44   /**
    45    * Sets the bean DAO service/loader used to load the beans.
    46    */
    47   public void setDataBeanDAOService(DataBeanDAOService dataBeanDAOService) {
    48     this.dataDataBeanDAOService = dataBeanDAOService;
    49   } //-------------------------- End of Method ------------------------------
    50 
    5118
    5219  /**
    5320   * Builds the XML document based on the indicator view name.
    54    * @param indicatorViewName name of the indicator view to have converted.
     21   * @param datasetName name of the indicator view to have converted.
    5522   * @return complete XML document of the indicator view DataBean based on the
    5623   *   supplied indicator view name.
    5724   */
    58   public Node getDocument(String indicatorViewName) throws Exception {
    59     IndicatorView indicatorView = new IndicatorView();
    60     indicatorView.setFieldValue("NAME",        indicatorViewName);
    61     indicatorView.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
    62     if(this.dataDataBeanDAOService.load(indicatorView) == 0) return(null);
    63     return(getDocument(indicatorView));
     25  public Node getDocument(String datasetName) throws Exception {
     26    Dataset dataset = new Dataset();
     27    dataset.setFieldValue("NAME",        datasetName);
     28    dataset.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
     29    if(this.dataBeanDAOService.load(dataset) == 0) return(null);
     30    return(getDocument(dataset));
    6431  } //-------------------------- End of Method ------------------------------
    6532
    6633  /**
    6734   * Builds the XML document based on the indicator view databean.
    68    * @param indicatorView databean of the indicator view to have converted.
     35   * @param dataset databean of the indicator view to have converted.
    6936   * @return complete XML document of the indicator view DataBean based on the
    7037   *   supplied indicator view name.
    7138   */
    72   public Node getDocument(IndicatorView indicatorView) throws Exception {
    73     Node document = XMLLib.newDocument("INDICATOR_VIEW");
    74     addDataBeanToNode(document, indicatorView);
     39  public Node getDocument(Dataset dataset) throws Exception {
     40    Node document = XMLLib.newDocument("DATASET");
     41    addDataBeanToNode(document, dataset);
    7542
    76     XMLLib.addNode(document, getDataSourcesElement(indicatorView));
    77     XMLLib.addNode(document, getDatasetSeriesElement(indicatorView));
    78     XMLLib.addNode(document, getDatasetCategoryElement(indicatorView));
    79 //    XMLLib.addNode(document, getSeriesDimensionElement(indicatorView));
    80 //    XMLLib.addNode(document, getCategoryDimensionElement(indicatorView));
    81 //    XMLLib.addNode(document, getPeriodDimensionElement(indicatorView));
    82     XMLLib.addNode(document, getMeasureElement(indicatorView));
    83     XMLLib.addNode(document, getChartElement(indicatorView));
    84     XMLLib.addNode(document, getMapElement(indicatorView));
    85     XMLLib.addNode(document, getIndicatorViewValuesElement(indicatorView));
    86     XMLLib.addNode(document, getSavedQueriesElement(indicatorView));
     43    XMLLib.addNode(document, getMeasureElement(dataset));
     44    XMLLib.addNode(document, getDataSourcesElement(dataset));
     45    XMLLib.addNode(document, getDatasetDimensionsElement(dataset));
     46    XMLLib.addNode(document, getRecordsElement(dataset));
     47    XMLLib.addNode(document, getSavedQueriesElement(dataset));
    8748   
    8849    return(document);
     
    9354   * Creates DATA_SOURCES container and child elements based on the supplied
    9455   * indicator view.
    95    * @param indicatorView view DataBean to be converted to XML
     56   * @param dataset view DataBean to be converted to XML
    9657   * @return XML DATA_SOURCES element for the supplied indicator view DataBean.
    9758   */
    98   public Node getDataSourcesElement(IndicatorView indicatorView) throws Exception {
     59  public Node getDataSourcesElement(Dataset dataset) throws Exception {
    9960    Node dataSourcesNode = XMLLib.newNode("DATA_SOURCES");
    10061
    101     ArrayList<DataBean> indicatorViewDataSourceCollection = new ArrayList<DataBean>();
    102     DataSourceToDataset indicatorViewDataSource = new DataSourceToDataset();
    103     indicatorViewDataSource.setFieldValue("INDICATOR_VIEW_NAME", indicatorView.getName());
    104     this.dataDataBeanDAOService.load(indicatorViewDataSourceCollection, indicatorViewDataSource);
     62    ArrayList<DataBean> datasetDataSourceCollection = new ArrayList<DataBean>();
     63    DataSourceToDataset datasetDataSource = new DataSourceToDataset();
     64    datasetDataSource.setFieldValue("DATASET_NAME", dataset.getName());
     65    this.dataBeanDAOService.load(datasetDataSourceCollection, datasetDataSource);
    10566
    106     for(int i=0; i<indicatorViewDataSourceCollection.size(); i++) {
    107       indicatorViewDataSource = (DataSourceToDataset)indicatorViewDataSourceCollection.get(i);
     67    for(int i=0; i<datasetDataSourceCollection.size(); i++) {
     68      datasetDataSource = (DataSourceToDataset)datasetDataSourceCollection.get(i);
    10869      DataSource dataSource = new DataSource();
    109       dataSource.setFieldValue("NAME",        indicatorViewDataSource.getDataSourceName());
     70      dataSource.setFieldValue("NAME",        datasetDataSource.getDataSourceName());
    11071      dataSource.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
    111       if(this.dataDataBeanDAOService.load(dataSource) > 0) {
    112         Node dataSourceElement = XMLLib.newNode("DATA_SOURCE");
    113         XMLLib.addAttribute(dataSourceElement, "name", dataSource.getName() );
    114         XMLLib.addNode(dataSourceElement, XMLLib.newNode("NAME", dataSource.getName() ) );
    115         XMLLib.addNode(dataSourceElement, XMLLib.newNode("TEXT", dataSource.getText() ) );
    116         XMLLib.addNode(dataSourceElement, XMLLib.newNode("SORT_ORDER", indicatorViewDataSource.getSortOrder() ));
     72      if(this.dataBeanDAOService.load(dataSource) > 0) {
     73        Node dataSourceElement = newNode("DATA_SOURCE", dataSource);
    11774        XMLLib.addNode(dataSourcesNode, dataSourceElement);
    11875      }
     
    12380
    12481  /**
    125    * Creates SAVED_QUERIES container and child elements based on the supplied
    126    * indicator view.
    127    * @param indicatorView view DataBean to be converted to XML
    128    * @return XML SAVED_QUERIES element for the supplied indicator view DataBean.
     82   * Creates DATASET's DIMENSION and DIMENSION_VALUES container and child
     83   * elements based on the supplied dataset and records.
     84   * @param dataset DataBean to be used for getting dimension XML.
     85   * @return XML DIMENSIONS element for the supplied dataset Databean.
    12986   */
    130   public Node getSavedQueriesElement(IndicatorView indicatorView) throws Exception {
    131     Node savedQueriesNode = XMLLib.newNode("SAVED_QUERIES");
     87  public Node getDatasetDimensionsElement(Dataset dataset) throws Exception {
     88    Node containerNode = XMLLib.newNode("DIMENSIONS");
    13289
    133     ArrayList<DataBean> indicatorViewSavedQueryCollection = new ArrayList<DataBean>();
    134     IndicatorViewSavedQuery indicatorViewSavedQuery = new IndicatorViewSavedQuery();
    135     indicatorViewSavedQuery.setFieldValue("INDICATOR_VIEW_NAME", indicatorView.getName());
    136     this.dataDataBeanDAOService.load(indicatorViewSavedQueryCollection, indicatorViewSavedQuery);
     90    ArrayList<DataBean> dimensionToDatasetCollection = new ArrayList<DataBean>();
     91    DimensionToDataset dimensionToDataset = new DimensionToDataset();
     92    dimensionToDataset.setFieldValue("DATASET_NAME", dataset.getName());
     93    this.dataBeanDAOService.load(dimensionToDatasetCollection, dimensionToDataset);
    13794
    138     for(int i=0; i<indicatorViewSavedQueryCollection.size(); i++) {
    139       indicatorViewSavedQuery = (IndicatorViewSavedQuery)indicatorViewSavedQueryCollection.get(i);
    140       Node savedQueryElement = XMLLib.newNode("SAVED_QUERY");
    141       XMLLib.addNode(savedQueryElement, XMLLib.newNode("TITLE", indicatorViewSavedQuery.getTitle()) );
    142       XMLLib.addNode(savedQueryElement, XMLLib.newNode("URL",   indicatorViewSavedQuery.getURL() ));
    143       XMLLib.addNode(savedQueryElement, XMLLib.newNode("SORT_ORDER", indicatorViewSavedQuery.getSortOrder() ));
    144       XMLLib.addNode(savedQueriesNode, savedQueryElement);
     95    for(int i=0; i<dimensionToDatasetCollection.size(); i++) {
     96      dimensionToDataset  = (DimensionToDataset)dimensionToDatasetCollection.get(i);
     97      Dimension dimension = new Dimension();
     98      dimension.setFieldValue("NAME", dimensionToDataset.getDimensionName());
     99      this.dataBeanDAOService.load(dimension);
     100
     101      Node dimensionNode = this.newNode("DIMENSION", dimension);
     102
     103      ArrayList<DataBean> dimensionValueCollection = new ArrayList<DataBean>();
     104      DimensionValue dimensionValue = new DimensionValue();
     105      dimensionValue.setFieldValue("DIMENSION_NAME", dimension.getName());
     106      this.dataBeanDAOService.load(dimensionValueCollection, dimensionValue);
     107      Node dimensionValuesNode = XMLLib.newNode("DIMENSION_VALUES");
     108
     109      // loop for all dimension values.  Add the element if it is used.
     110      for(int j=0; j<dimensionValueCollection.size(); j++) {
     111        dimensionValue = (DimensionValue)dimensionValueCollection.get(i);
     112// TODO: check if the dim value is actually used.  If so then add it...
     113        this.addDataBeanToNode(dimensionValuesNode, dimensionValue);
     114//        Node dataSourceElement = newNode("DATA_SOURCE", dataSource);
     115//        XMLLib.addNode(dataSourcesNode, dataSourceElement);
     116      }
     117      XMLLib.addNode(containerNode, dimensionNode);
    145118    }
    146     return(savedQueriesNode);
    147   } //-------------------------- End of Method ------------------------------
    148 
    149 
    150 
    151 
    152 
    153   /**
    154    * Creates DATASET_SERIES container and child elements based on the supplied
    155    * indicator view.
    156    * @param indicatorView DataBean to be converted to XML
    157    * @return XML DATASET_SERIES element for the supplied indicator view DataBean.
    158    */
    159   public Node getDatasetSeriesElement(org.ibisph.indicatorprofile.databean.IndicatorView indicatorView) throws Exception {
    160     Node containerNode = XMLLib.newNode("DATASET_SERIES");
    161 
    162     Measure datasetSeries = new Measure();
    163     this.dataDataBeanDAOService.load(datasetSeries, "NAME", "series");
    164     addDataBeanToNode(containerNode, datasetSeries);
    165 
    166     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    167     MeasureValue datasetSeriesValue = new MeasureValue();
    168     datasetSeriesValue.setFieldValue("DATASET_SERIES_NAME","series");
    169     datasetSeriesValue.setFieldValue("ACTIVE_FLAG",         this.dataBeanFlagValue);
    170     this.dataDataBeanDAOService.load(valuesCollection, datasetSeriesValue);
    171     Node valuesContainerNode = newNode("DATASET_SERIES_VALUES", valuesCollection);
    172     XMLLib.addNode(containerNode, valuesContainerNode);
    173119
    174120    return(containerNode);
     
    176122
    177123
     124
    178125  /**
    179    * Creates DATASET_CATEGORY container and child elements based on the supplied
    180    * indicator view.
    181    * @param indicatorView DataBean to be converted to XML
    182    * @return XML DATASET_CATEGORY element for the supplied indicator view DataBean.
     126   * MEASURE container and child elements based on the supplied dataset.
     127   * @param dataset DataBean used to lookup the measure to be converted to XML.
     128   * @return XML MEASURE element for the supplied dataset DataBean.
    183129   */
    184   public Node getDatasetCategoryElement(IndicatorView indicatorView) throws Exception {
    185     Node containerNode = XMLLib.newNode("DATASET_CATEGORY");
    186 
    187     Dimension datasetCategory = new Dimension();
    188     datasetCategory.setFieldValue("NAME", "category");
    189     this.dataDataBeanDAOService.load(datasetCategory);
    190     this.addDataBeanToNode(containerNode, datasetCategory);
    191 
    192     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    193     DimensionValue datasetCategoryValue = new DimensionValue();
    194     datasetCategoryValue.setFieldValue("DATASET_CATEGORY_NAME", "category");
    195     datasetCategoryValue.setFieldValue("ACTIVE_FLAG",           this.dataBeanFlagValue);
    196     this.dataDataBeanDAOService.load(valuesCollection, datasetCategoryValue);
    197     XMLLib.addNode(containerNode, newNode("DATASET_CATEGORY_VALUES", valuesCollection));
    198 
    199     return(containerNode);
    200   } //-------------------------- End of Method ------------------------------
    201 
    202  
    203  
    204  
    205  
    206  
    207   /**
    208    * Creates SERIES_DIMENSION container and child elements based on the supplied
    209    * indicator view.
    210    * @param indicatorView DataBean to be converted to XML
    211    * @return XML DATASET_SERIES element for the supplied indicator view DataBean.
    212    */
    213   public Node getSeriesDimensionElement(org.ibisph.indicatorprofile.databean.IndicatorView indicatorView) throws Exception {
    214     Node containerNode = XMLLib.newNode("SERIES_DIMENSION");
    215 
    216     Measure datasetSeries = new Measure();
    217 //    this.dataDataBeanDAOService.load(datasetSeries, "NAME", indicatorView.getSeriesDimensionName());
    218     addDataBeanToNode(containerNode, datasetSeries);
    219 
    220     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    221     MeasureValue datasetSeriesValue = new MeasureValue();
    222     datasetSeriesValue.setFieldValue("SERIES_DIMENSION_NAME", datasetSeries.getName());
    223     datasetSeriesValue.setFieldValue("ACTIVE_FLAG",           this.dataBeanFlagValue);
    224     this.dataDataBeanDAOService.load(valuesCollection, datasetSeriesValue);
    225     Node valuesContainerNode = newNode("DIMENSION_VALUES", valuesCollection);
    226     XMLLib.addNode(containerNode, valuesContainerNode);
    227 
    228     return(containerNode);
     130  public Node getMeasureElement(Dataset dataset) throws Exception {
     131    Measure measure = new Measure();
     132    this.dataBeanDAOService.load(measure, "NAME", dataset.getMeasureName());
     133    return(newNode("MEASURE", measure));
    229134  } //-------------------------- End of Method ------------------------------
    230135
    231136
    232   /**
    233    * Creates CATEGORY DIMENSION container and child elements based on the supplied
    234    * indicator view.
    235    * @param indicatorView DataBean to be converted to XML
    236    * @return XML CATEGORY_DIMENSION element for the supplied indicator view DataBean.
    237    */
    238   public Node getCategoryDimensionElement(IndicatorView indicatorView) throws Exception {
    239     Node containerNode = XMLLib.newNode("CATEGORY_DIMENSION");
    240 
    241     Dimension categoryDimension = new Dimension();
    242 //    categoryDimension.setFieldValue("NAME", indicatorView.getCategoryDimensionName());
    243     this.dataDataBeanDAOService.load(categoryDimension);
    244     this.addDataBeanToNode(containerNode, categoryDimension);
    245 
    246     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    247     DimensionValue datasetCategoryValue = new DimensionValue();
    248     datasetCategoryValue.setFieldValue("CATEGORY_DIMENSION_NAME", categoryDimension.getName());
    249     datasetCategoryValue.setFieldValue("ACTIVE_FLAG",             this.dataBeanFlagValue);
    250     this.dataDataBeanDAOService.load(valuesCollection, datasetCategoryValue);
    251     XMLLib.addNode(containerNode, newNode("DIMENSION_VALUES", valuesCollection));
    252 
    253     return(containerNode);
    254   } //-------------------------- End of Method ------------------------------
    255 
    256 
    257 /**
    258  * TODO: Creates VALUE_TYPE container and child elements based on the supplied
    259  * indicator view.
    260  * @param indicatorView DataBean to be converted to XML
    261  * @return XML VALUE_TYPE element for the supplied indicator view
    262  *   DataBean.
    263  */
    264 public Node getMeasureElement(IndicatorView indicatorView) throws Exception {
    265 // TODO:
    266   ValueType valueType = new ValueType();
    267 //  this.dataDataBeanDAOService.load(valueType, "NAME", indicatorView.getValueTypeName());
    268   return(newNode("VALUE_TYPE", valueType));
    269 } //-------------------------- End of Method ------------------------------
    270 
    271137
    272138  /**
    273    * Creates CHART container and child elements based on the supplied
    274    * indicator view.
    275    * @param indicatorView DataBean to be converted to XML
    276    * @return XML CHART element for the supplied indicator view
    277    *   DataBean.
    278    */
    279   public Node getChartElement(IndicatorView indicatorView) throws Exception {
    280     Chart chart = new Chart();
    281     this.dataDataBeanDAOService.load(chart, "NAME", indicatorView.getChartName());
    282     return(newNode("CHART", chart));
    283   } //-------------------------- End of Method ------------------------------
    284 
    285   /**
    286    * Creates MAP container and child elements based on the supplied
    287    * indicator view.
    288    * @param indicatorView DataBean to be converted to XML
    289    * @return XML MAP element for the supplied indicator view
    290    *   DataBean.
    291    */
    292   public Node getMapElement(IndicatorView indicatorView) throws Exception {
    293     Map map = new Map();
    294     this.dataDataBeanDAOService.load(map, "NAME", indicatorView.getMapName());
    295     return(newNode("MAP", map));
    296   } //-------------------------- End of Method ------------------------------
    297 
    298 
    299   /**
    300    * Creates INDICATOR_VIEW_VALUES container and child elements based on the
     139   * Creates RECORDS container and child elements based on the
    301140   * supplied indicator view.  Note that this ONLY grabs the values that are
    302141   * associated with the view's current series and categories.  The reason for
    303142   * this is that orphaned values can mess with the value count when trying to
    304143   * determine a chart's height which is based on the count of values.
    305    * @param indicatorView DataBean to be converted to XML
     144   * @param dataset DataBean to be converted to XML
    306145   * @return XML INDICATOR_VIEW_VALUES element for the supplied indicator view DataBean.
    307146   */
    308   public Node getIndicatorViewValuesElement(IndicatorView indicatorView) throws Exception {
     147  public Node getRecordsElement(Dataset dataset) throws Exception {
    309148    ArrayList<DataBean> valuesCollection  = new ArrayList<DataBean>();
    310     DatasetRecord indicatorViewValue = new DatasetRecord();
    311     indicatorViewValue.setFieldValue("INDICATOR_VIEW_NAME",   indicatorView.getName());
    312 //    indicatorViewValue.setFieldValue("SERIES_DIMENSION_NAME",   indicatorView.getSeriesDimensionName());
    313 //    indicatorViewValue.setFieldValue("CATEGORY_DIMENSION_NAME", indicatorView.getCategoryDimensionName());
    314     indicatorViewValue.setFieldValue("ACTIVE_FLAG",             this.dataBeanFlagValue);
    315     this.dataDataBeanDAOService.load(valuesCollection, indicatorViewValue);
    316     Node valuesContainerElement = newNode("INDICATOR_VIEW_VALUES", valuesCollection);
     149    DatasetRecord datasetValue = new DatasetRecord();
     150    datasetValue.setFieldValue("DATASET_NAME",   dataset.getName());
     151//    datasetValue.setFieldValue("SERIES_DIMENSION_NAME",   dataset.getSeriesDimensionName());
     152//    datasetValue.setFieldValue("CATEGORY_DIMENSION_NAME", dataset.getCategoryDimensionName());
     153    datasetValue.setFieldValue("ACTIVE_FLAG",             this.dataBeanFlagValue);
     154    this.dataBeanDAOService.load(valuesCollection, datasetValue);
     155    Node valuesContainerElement = newNode("RECORDS", valuesCollection);
    317156
    318157    return(valuesContainerElement);
    319158  } //-------------------------- End of Method ------------------------------
    320159
     160
     161
     162  /**
     163   * Creates SAVED_QUERIES container and child elements based on the supplied
     164   * indicator view.
     165   * @param dataset view DataBean to be converted to XML
     166   * @return XML SAVED_QUERIES element for the supplied indicator view DataBean.
     167   */
     168  public Node getSavedQueriesElement(Dataset dataset) throws Exception {
     169    Node savedQueriesNode = XMLLib.newNode("SAVED_QUERIES");
     170/*
     171    ArrayList<DataBean> datasetSavedQueryCollection = new ArrayList<DataBean>();
     172    DatasetSavedQuery datasetSavedQuery = new DatasetSavedQuery();
     173    datasetSavedQuery.setFieldValue("DATASET_NAME", dataset.getName());
     174    this.dataBeanDAOService.load(datasetSavedQueryCollection, datasetSavedQuery);
     175
     176    for(int i=0; i<datasetSavedQueryCollection.size(); i++) {
     177      datasetSavedQuery = (DatasetSavedQuery)datasetSavedQueryCollection.get(i);
     178      Node savedQueryElement = XMLLib.newNode("SAVED_QUERY");
     179      XMLLib.addNode(savedQueryElement, XMLLib.newNode("TITLE", datasetSavedQuery.getTitle()) );
     180      XMLLib.addNode(savedQueryElement, XMLLib.newNode("URL",   datasetSavedQuery.getURL() ));
     181      XMLLib.addNode(savedQueryElement, XMLLib.newNode("SORT_ORDER", datasetSavedQuery.getSortOrder() ));
     182      XMLLib.addNode(savedQueriesNode, savedQueryElement);
     183    }
     184*/
     185    return(savedQueriesNode);
     186  } //-------------------------- End of Method ------------------------------
     187
    321188} //============================ END OF CLASS =================================
    322189
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorViewDataBeanToXML.java

    r11741 r13360  
    44
    55import org.dom4j.Node;
     6
    67import org.ibisph.databean.DataBean;
    78import org.ibisph.databean.DataBeanToXMLService;
    8 import org.ibisph.databean.dao.DataBeanDAOService;
    9 import org.ibisph.indicatorprofile.databean.Chart;
    10 import org.ibisph.indicatorprofile.databean.DataSource;
    11 import org.ibisph.indicatorprofile.databean.Dimension;
    12 import org.ibisph.indicatorprofile.databean.DimensionValue;
    13 import org.ibisph.indicatorprofile.databean.IndicatorView;
    14 import org.ibisph.indicatorprofile.databean.DataSourceToDataset;
    15 import org.ibisph.indicatorprofile.databean.IndicatorViewSavedQuery;
    16 import org.ibisph.indicatorprofile.databean.DatasetRecord;
    17 import org.ibisph.indicatorprofile.databean.Map;
    18 import org.ibisph.indicatorprofile.databean.Measure;
    19 import org.ibisph.indicatorprofile.databean.MeasureValue;
    20 import org.ibisph.indicatorprofile.databean.ValueType;
     9import org.ibisph.indicatorprofile.databean.*;
    2110import org.ibisph.util.XMLLib;
    2211
     
    2817 */
    2918public class IndicatorViewDataBeanToXML extends DataBeanToXMLService {
    30   protected String dataBeanFlagValue = "x";
    31 
    32   protected DataBeanDAOService dataDataBeanDAOService;
    33 
    34 
    35   /**
    36    * Flag value used to specify the _FLAG type RDBMS record field value.
    37    * @param dataBeanFlagValue value used in the db table which typically
    38    *   indicates that the record is active or is a period etc.
    39    */
    40   public void setDataBeanFlagValue(String dataBeanFlagValue) {
    41     this.dataBeanFlagValue = dataBeanFlagValue;
    42   } //-------------------------- End of Method ------------------------------
    43 
    44   /**
    45    * Sets the bean DAO service/loader used to load the beans.
    46    */
    47   public void setDataBeanDAOService(DataBeanDAOService dataBeanDAOService) {
    48     this.dataDataBeanDAOService = dataBeanDAOService;
    49   } //-------------------------- End of Method ------------------------------
    50 
    5119
    5220  /**
     
    6028    indicatorView.setFieldValue("NAME",        indicatorViewName);
    6129    indicatorView.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
    62     if(this.dataDataBeanDAOService.load(indicatorView) == 0) return(null);
     30    if(this.dataBeanDAOService.load(indicatorView) == 0) return(null);
    6331    return(getDocument(indicatorView));
    6432  } //-------------------------- End of Method ------------------------------
     
    6634  /**
    6735   * Builds the XML document based on the indicator view databean.
    68    * @param indicatorView databean of the indicator view to have converted.
    69    * @return complete XML document of the indicator view DataBean based on the
    70    *   supplied indicator view name.
     36   * @param indicatorView databean to be converted to XML.
     37   * @return complete XML document of the indicator view DataBean.
    7138   */
    7239  public Node getDocument(IndicatorView indicatorView) throws Exception {
     
    7441    addDataBeanToNode(document, indicatorView);
    7542
    76     XMLLib.addNode(document, getDataSourcesElement(indicatorView));
    77     XMLLib.addNode(document, getDatasetSeriesElement(indicatorView));
    78     XMLLib.addNode(document, getDatasetCategoryElement(indicatorView));
    79 //    XMLLib.addNode(document, getSeriesDimensionElement(indicatorView));
    80 //    XMLLib.addNode(document, getCategoryDimensionElement(indicatorView));
    81 //    XMLLib.addNode(document, getPeriodDimensionElement(indicatorView));
    82     XMLLib.addNode(document, getMeasureElement(indicatorView));
     43    // add the period, series, category dimensions and values.
     44    XMLLib.addNode(document, getPeriodDimensionElement(indicatorView));
     45    XMLLib.addNode(document, getSeriesDimensionElement(indicatorView));
     46    XMLLib.addNode(document, getCategoryDimensionElement(indicatorView));
    8347    XMLLib.addNode(document, getChartElement(indicatorView));
    8448    XMLLib.addNode(document, getMapElement(indicatorView));
    85     XMLLib.addNode(document, getIndicatorViewValuesElement(indicatorView));
    8649    XMLLib.addNode(document, getSavedQueriesElement(indicatorView));
    8750   
     
    9659   * @return XML DATA_SOURCES element for the supplied indicator view DataBean.
    9760   */
    98   public Node getDataSourcesElement(IndicatorView indicatorView) throws Exception {
     61  public Node getPeriodDimensionElement(IndicatorView indicatorView) throws Exception {
    9962    Node dataSourcesNode = XMLLib.newNode("DATA_SOURCES");
    10063
     
    10265    DataSourceToDataset indicatorViewDataSource = new DataSourceToDataset();
    10366    indicatorViewDataSource.setFieldValue("INDICATOR_VIEW_NAME", indicatorView.getName());
    104     this.dataDataBeanDAOService.load(indicatorViewDataSourceCollection, indicatorViewDataSource);
     67    this.dataBeanDAOService.load(indicatorViewDataSourceCollection, indicatorViewDataSource);
    10568
    10669    for(int i=0; i<indicatorViewDataSourceCollection.size(); i++) {
     
    10972      dataSource.setFieldValue("NAME",        indicatorViewDataSource.getDataSourceName());
    11073      dataSource.setFieldValue("ACTIVE_FLAG", this.dataBeanFlagValue);
    111       if(this.dataDataBeanDAOService.load(dataSource) > 0) {
     74      if(this.dataBeanDAOService.load(dataSource) > 0) {
    11275        Node dataSourceElement = XMLLib.newNode("DATA_SOURCE");
    11376        XMLLib.addAttribute(dataSourceElement, "name", dataSource.getName() );
     
    12285
    12386
    124   /**
    125    * Creates SAVED_QUERIES container and child elements based on the supplied
    126    * indicator view.
    127    * @param indicatorView view DataBean to be converted to XML
    128    * @return XML SAVED_QUERIES element for the supplied indicator view DataBean.
    129    */
    130   public Node getSavedQueriesElement(IndicatorView indicatorView) throws Exception {
    131     Node savedQueriesNode = XMLLib.newNode("SAVED_QUERIES");
    132 
    133     ArrayList<DataBean> indicatorViewSavedQueryCollection = new ArrayList<DataBean>();
    134     IndicatorViewSavedQuery indicatorViewSavedQuery = new IndicatorViewSavedQuery();
    135     indicatorViewSavedQuery.setFieldValue("INDICATOR_VIEW_NAME", indicatorView.getName());
    136     this.dataDataBeanDAOService.load(indicatorViewSavedQueryCollection, indicatorViewSavedQuery);
    137 
    138     for(int i=0; i<indicatorViewSavedQueryCollection.size(); i++) {
    139       indicatorViewSavedQuery = (IndicatorViewSavedQuery)indicatorViewSavedQueryCollection.get(i);
    140       Node savedQueryElement = XMLLib.newNode("SAVED_QUERY");
    141       XMLLib.addNode(savedQueryElement, XMLLib.newNode("TITLE", indicatorViewSavedQuery.getTitle()) );
    142       XMLLib.addNode(savedQueryElement, XMLLib.newNode("URL",   indicatorViewSavedQuery.getURL() ));
    143       XMLLib.addNode(savedQueryElement, XMLLib.newNode("SORT_ORDER", indicatorViewSavedQuery.getSortOrder() ));
    144       XMLLib.addNode(savedQueriesNode, savedQueryElement);
    145     }
    146     return(savedQueriesNode);
    147   } //-------------------------- End of Method ------------------------------
    148 
    149 
    150 
    151 
    152 
    153   /**
    154    * Creates DATASET_SERIES container and child elements based on the supplied
    155    * indicator view.
    156    * @param indicatorView DataBean to be converted to XML
    157    * @return XML DATASET_SERIES element for the supplied indicator view DataBean.
    158    */
    159   public Node getDatasetSeriesElement(org.ibisph.indicatorprofile.databean.IndicatorView indicatorView) throws Exception {
    160     Node containerNode = XMLLib.newNode("DATASET_SERIES");
    161 
    162     Measure datasetSeries = new Measure();
    163     this.dataDataBeanDAOService.load(datasetSeries, "NAME", "series");
    164     addDataBeanToNode(containerNode, datasetSeries);
    165 
    166     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    167     MeasureValue datasetSeriesValue = new MeasureValue();
    168     datasetSeriesValue.setFieldValue("DATASET_SERIES_NAME","series");
    169     datasetSeriesValue.setFieldValue("ACTIVE_FLAG",         this.dataBeanFlagValue);
    170     this.dataDataBeanDAOService.load(valuesCollection, datasetSeriesValue);
    171     Node valuesContainerNode = newNode("DATASET_SERIES_VALUES", valuesCollection);
    172     XMLLib.addNode(containerNode, valuesContainerNode);
    173 
    174     return(containerNode);
    175   } //-------------------------- End of Method ------------------------------
    176 
    177 
    178   /**
    179    * Creates DATASET_CATEGORY container and child elements based on the supplied
    180    * indicator view.
    181    * @param indicatorView DataBean to be converted to XML
    182    * @return XML DATASET_CATEGORY element for the supplied indicator view DataBean.
    183    */
    184   public Node getDatasetCategoryElement(IndicatorView indicatorView) throws Exception {
    185     Node containerNode = XMLLib.newNode("DATASET_CATEGORY");
    186 
    187     Dimension datasetCategory = new Dimension();
    188     datasetCategory.setFieldValue("NAME", "category");
    189     this.dataDataBeanDAOService.load(datasetCategory);
    190     this.addDataBeanToNode(containerNode, datasetCategory);
    191 
    192     ArrayList<DataBean> valuesCollection = new ArrayList<DataBean>();
    193     DimensionValue datasetCategoryValue = new DimensionValue();
    194     datasetCategoryValue.setFieldValue("DATASET_CATEGORY_NAME", "category");
    195     datasetCategoryValue.setFieldValue("ACTIVE_FLAG",           this.dataBeanFlagValue);
    196     this.dataDataBeanDAOService.load(valuesCollection, datasetCategoryValue);
    197     XMLLib.addNode(containerNode, newNode("DATASET_CATEGORY_VALUES", valuesCollection));
    198 
    199     return(containerNode);
    200   } //-------------------------- End of Method ------------------------------
    201 
    202  
    203  
    204  
    205  
    20687 
    20788  /**
     
    222103    datasetSeriesValue.setFieldValue("SERIES_DIMENSION_NAME", datasetSeries.getName());
    223104    datasetSeriesValue.setFieldValue("ACTIVE_FLAG",           this.dataBeanFlagValue);
    224     this.dataDataBeanDAOService.load(valuesCollection, datasetSeriesValue);
     105    this.dataBeanDAOService.load(valuesCollection, datasetSeriesValue);
    225106    Node valuesContainerNode = newNode("DIMENSION_VALUES", valuesCollection);
    226107    XMLLib.addNode(containerNode, valuesContainerNode);
     
    241122    Dimension categoryDimension = new Dimension();
    242123//    categoryDimension.setFieldValue("NAME", indicatorView.getCategoryDimensionName());
    243     this.dataDataBeanDAOService.load(categoryDimension);
     124    this.dataBeanDAOService.load(categoryDimension);
    244125    this.addDataBeanToNode(containerNode, categoryDimension);
    245126
     
    248129    datasetCategoryValue.setFieldValue("CATEGORY_DIMENSION_NAME", categoryDimension.getName());
    249130    datasetCategoryValue.setFieldValue("ACTIVE_FLAG",             this.dataBeanFlagValue);
    250     this.dataDataBeanDAOService.load(valuesCollection, datasetCategoryValue);
     131    this.dataBeanDAOService.load(valuesCollection, datasetCategoryValue);
    251132    XMLLib.addNode(containerNode, newNode("DIMENSION_VALUES", valuesCollection));
    252133
    253134    return(containerNode);
    254135  } //-------------------------- End of Method ------------------------------
    255 
    256 
    257 /**
    258  * TODO: Creates VALUE_TYPE container and child elements based on the supplied
    259  * indicator view.
    260  * @param indicatorView DataBean to be converted to XML
    261  * @return XML VALUE_TYPE element for the supplied indicator view
    262  *   DataBean.
    263  */
    264 public Node getMeasureElement(IndicatorView indicatorView) throws Exception {
    265 // TODO:
    266   ValueType valueType = new ValueType();
    267 //  this.dataDataBeanDAOService.load(valueType, "NAME", indicatorView.getValueTypeName());
    268   return(newNode("VALUE_TYPE", valueType));
    269 } //-------------------------- End of Method ------------------------------
    270136
    271137
     
    279145  public Node getChartElement(IndicatorView indicatorView) throws Exception {
    280146    Chart chart = new Chart();
    281     this.dataDataBeanDAOService.load(chart, "NAME", indicatorView.getChartName());
     147    this.dataBeanDAOService.load(chart, "NAME", indicatorView.getChartName());
    282148    return(newNode("CHART", chart));
    283149  } //-------------------------- End of Method ------------------------------
     
    292158  public Node getMapElement(IndicatorView indicatorView) throws Exception {
    293159    Map map = new Map();
    294     this.dataDataBeanDAOService.load(map, "NAME", indicatorView.getMapName());
     160    this.dataBeanDAOService.load(map, "NAME", indicatorView.getMapName());
    295161    return(newNode("MAP", map));
    296162  } //-------------------------- End of Method ------------------------------
    297163
    298164
     165
    299166  /**
    300    * Creates INDICATOR_VIEW_VALUES container and child elements based on the
    301    * supplied indicator view.  Note that this ONLY grabs the values that are
    302    * associated with the view's current series and categories.  The reason for
    303    * this is that orphaned values can mess with the value count when trying to
    304    * determine a chart's height which is based on the count of values.
    305    * @param indicatorView DataBean to be converted to XML
    306    * @return XML INDICATOR_VIEW_VALUES element for the supplied indicator view DataBean.
     167   * Creates SAVED_QUERIES container and child elements based on the supplied
     168   * indicator view.
     169   * @param indicatorView view DataBean to be converted to XML
     170   * @return XML SAVED_QUERIES element for the supplied indicator view DataBean.
    307171   */
    308   public Node getIndicatorViewValuesElement(IndicatorView indicatorView) throws Exception {
    309     ArrayList<DataBean> valuesCollection  = new ArrayList<DataBean>();
    310     DatasetRecord indicatorViewValue = new DatasetRecord();
    311     indicatorViewValue.setFieldValue("INDICATOR_VIEW_NAME",   indicatorView.getName());
    312 //    indicatorViewValue.setFieldValue("SERIES_DIMENSION_NAME",   indicatorView.getSeriesDimensionName());
    313 //    indicatorViewValue.setFieldValue("CATEGORY_DIMENSION_NAME", indicatorView.getCategoryDimensionName());
    314     indicatorViewValue.setFieldValue("ACTIVE_FLAG",             this.dataBeanFlagValue);
    315     this.dataDataBeanDAOService.load(valuesCollection, indicatorViewValue);
    316     Node valuesContainerElement = newNode("INDICATOR_VIEW_VALUES", valuesCollection);
     172  public Node getSavedQueriesElement(IndicatorView indicatorView) throws Exception {
     173    Node savedQueriesNode = XMLLib.newNode("SAVED_QUERIES");
    317174
    318     return(valuesContainerElement);
     175    ArrayList<DataBean> indicatorViewSavedQueryCollection = new ArrayList<DataBean>();
     176    IndicatorViewSavedQuery indicatorViewSavedQuery = new IndicatorViewSavedQuery();
     177    indicatorViewSavedQuery.setFieldValue("INDICATOR_VIEW_NAME", indicatorView.getName());
     178    this.dataBeanDAOService.load(indicatorViewSavedQueryCollection, indicatorViewSavedQuery);
     179
     180    for(int i=0; i<indicatorViewSavedQueryCollection.size(); i++) {
     181      indicatorViewSavedQuery = (IndicatorViewSavedQuery)indicatorViewSavedQueryCollection.get(i);
     182      Node savedQueryElement = XMLLib.newNode("SAVED_QUERY");
     183      XMLLib.addNode(savedQueryElement, XMLLib.newNode("TITLE", indicatorViewSavedQuery.getTitle()) );
     184      XMLLib.addNode(savedQueryElement, XMLLib.newNode("URL",   indicatorViewSavedQuery.getURL() ));
     185      XMLLib.addNode(savedQueryElement, XMLLib.newNode("SORT_ORDER", indicatorViewSavedQuery.getSortOrder() ));
     186      XMLLib.addNode(savedQueriesNode, savedQueryElement);
     187    }
     188    return(savedQueriesNode);
    319189  } //-------------------------- End of Method ------------------------------
    320190
Note: See TracChangeset for help on using the changeset viewer.