Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Luigi Serra
2 parents f748e9cf 3b831dc4
Showing 5 changed files with 59 additions and 10 deletions
datalets/donutpie3dchart-datalet/demo/index.html
datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html
datalets/donutpie3dchart-datalet/donutpie3dchart-datalets.png → datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.png
datalets/donutpie3dchart-datalet/info.xml
demo.html
@@ -12,7 +12,7 @@
 <script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
 <link rel="import" href="../donutpie3dchart-datalet.html" />
-<donutpie3dchart-datalet data-url="https://data.issy.com/api/records/1.0/search?dataset=flux-rss-des-offres-demplois-a-issy-les-moulineaux&sort=published&facet=published&refine.published=2015"
+<donutpie3dchart-datalet data-url="https://data.issy.com/api/records/1.0/search?dataset=flux-rss-des-offres-demplois-a-issy-les-moulineaux&sort=published&facet=published&refine.published=2015%2F10"
                          fields='["facet_groups,facets,facets,path","facet_groups,facets,facets,count"]'></donutpie3dchart-datalet>
 </body>
 </html>
@@ -80,10 +80,7 @@ Example:
                         }
                     },
                     title: {
-                        text: ""
-                    },
-                    subtitle: {
-                        text: '3D Donut pie chart'
+                        text: "" + this._component.title
                     },
                     plotOptions: {
                         pie: {
@@ -128,7 +125,18 @@ Example:
                 behavior : {
                     type : Object,
                     value : {}
-                }
+                },
+                /**
+                 * It's the title of the chart
+                 *
+                 * @attribute title
+                 * @type Strig
+                 * @default ''
+                 */
+                title: {
+                    type: String,
+                    value: ""
+                },
             },
             /**
+<component>
+    <name>donutpie3dchart-datalet</name>
+    <attributes>
+        <attribute>
+            <name>data-url</name>
+        </attribute>
+        <attribute>
+            <name>fields</name>
+        </attribute>
+    </attributes>
+    <idm>
+        <inputs>
+            <input>
+                <name>Series</name>
+                <description>The chart series. Its values will be put on slice of  each series.</description>
+                <scale>nominal</scale>
+                <role>domain</role>
+                <selection>11</selection>
+            </input>
+            <input>
+                <name>Size </name>
+                <description>The size for each series to create a concentric rings</description>
+                <scale>nominal</scale>
+                <role>domain</role>
+                <selection>11</selection>
+            </input>
+            <layouts>
+                <input>
+                    <name>title</name>
+                    <description>The label for the title of the chart</description>
+                </input>
+            </layouts>
+        </inputs>
+    </idm>
+</component>
 \ No newline at end of file
@@ -262,8 +262,10 @@
 </template>
 <script>
-    DEEP.deepUrl = "http://deep.routetopa.eu/DEEP/";
-    DEEP.datasetsList = "http://deep.routetopa.eu/DEEP/datalets-list";
+    //DEEP.deepUrl = "http://deep.routetopa.eu/DEEP/";
+    //DEEP.datasetsList = "http://deep.routetopa.eu/DEEP/datalets-list";
+    DEEP.deepUrl = "http://192.168.186.137/DEEalerProvider/DEEP/";
+    DEEP.datasetsList = "http://192.168.186.137/DEEalerProvider/DEEP/datalets-list";
     DEEP.Datasets = {
         names:[
@@ -281,7 +283,9 @@
             'Ireland - Dun Laoghaire-Rathdown County Council Planning Application 2008-2014',
             'Ireland - Fingal Council Planning Applications for last 7 years',
             'Ireland - Planning Register',
-            'Ireland - Fingal Development Plan 2011-2017 Record of Protected Structures'
+            'Ireland - Fingal Development Plan 2011-2017 Record of Protected Structures',
+            'Bubble example',
+            'Issy -  3d pie chart'
         ],
         urls: [
             'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=07843fc3-07e1-4c66-9be4-fed43ca4a26f',
@@ -298,7 +302,9 @@
             'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=c479f061-9638-489d-ac55-0c68765548ff',
             'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=d29a477a-4734-43ef-8002-048c8640d441',
             'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=2b23f32d-e27e-4eef-af1e-27e05103df7d',
-            'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=5ea813bc-fdf9-4edb-b3b1-0142b593d5c6'
+            'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=5ea813bc-fdf9-4edb-b3b1-0142b593d5c6',
+            'http://ckan.routetopa.eu/api/action/datastore_search?resource_id=0cb600fc-19ad-4aaf-9794-1e6ea851840a',
+            "https://data.issy.com/api/records/1.0/search?dataset=flux-rss-des-offres-demplois-a-issy-les-moulineaux&sort=published&facet=published&refine.published=2015%2F10"
         ]
     };