dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5816
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-01-28 11:30:44 +0100
message:
  Minor fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java
  resources/sql/div.sql
  resources/util/clean_cde.sh
  resources/util/style.css


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2012-01-28 10:30:44 +0000
@@ -73,8 +73,7 @@
      * @param dataElement the DataElement to delete.
      * @throws HierarchyViolationException if the DataElement has children.
      */
-    void deleteDataElement( DataElement dataElement )
-        throws HierarchyViolationException;
+    void deleteDataElement( DataElement dataElement );
 
     /**
      * Returns a DataElement.

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java	2012-01-28 10:30:44 +0000
@@ -95,9 +95,6 @@
         {
             dataElementService.deleteDataElement( sourceDataElemenet );
         }
-        catch ( HierarchyViolationException ex )
-        {
-        }
         catch ( DeleteNotAllowedException ex )
         {
             log.info( "Not deleting data element because it has custom dimensions and more data associated with it" );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2012-01-27 11:40:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2012-01-28 10:30:44 +0000
@@ -42,7 +42,6 @@
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 import org.hisp.dhis.dataelement.comparator.DataElementCategoryComboSizeComparator;
 import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.hierarchy.HierarchyViolationException;
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.system.util.Filter;
@@ -51,8 +50,6 @@
 
 /**
  * @author Kristian Nordal
- * @version $Id: DefaultDataElementService.java 5243 2008-05-25 10:18:58Z
- *          larshelg $
  */
 @Transactional
 public class DefaultDataElementService
@@ -107,7 +104,6 @@
     }
 
     public void deleteDataElement( DataElement dataElement )
-        throws HierarchyViolationException //TODO remove
     {
         dataElementStore.delete( dataElement );
     }

=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql	2012-01-26 21:27:44 +0000
+++ resources/sql/div.sql	2012-01-28 10:30:44 +0000
@@ -45,4 +45,4 @@
 select cc.categorycomboid, cc.name as categorycomboname, cn.* from _categoryoptioncomboname cn
 join categorycombos_optioncombos co using(categoryoptioncomboid)
 join categorycombo cc using(categorycomboid)
-order by categorycomboname;
+order by categorycomboname, categoryoptioncomboname;

=== modified file 'resources/util/clean_cde.sh'
--- resources/util/clean_cde.sh	2012-01-26 14:58:59 +0000
+++ resources/util/clean_cde.sh	2012-01-28 10:30:44 +0000
@@ -23,6 +23,11 @@
 sed -i 's/<span[^>]*>//g' $1
 sed -i 's/<\/span>//g' $1
 
+# Remove strong open/end tags
+
+sed -i 's/<strong[^>]*>//g' $1
+sed -i 's/<\/strong>//g' $1
+
 # Remove all style, width, nowrap, valign, view attributes
 
 sed -i 's/style="[^"]*"//g' $1

=== modified file 'resources/util/style.css'
--- resources/util/style.css	2012-01-26 16:09:22 +0000
+++ resources/util/style.css	2012-01-28 10:30:44 +0000
@@ -1,5 +1,17 @@
 
-/* Handy styles for custom data entry forms */
+/* 
+
+Handy styles for custom data entry forms. Use with:
+
+<style type="text/css"></style>
+
+<div id="cde"></div>
+
+<h2></h2>
+
+<th></th>
+
+*/
 
 #cde table {
   border-collapse: collapse;