← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10490: Minor

 

------------------------------------------------------------
revno: 10490
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-04-07 23:25:18 +0200
message:
  Minor
modified:
  resources/jrxml/data_analysis_usage_stats.jrxml


--
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 'resources/jrxml/data_analysis_usage_stats.jrxml'
--- resources/jrxml/data_analysis_usage_stats.jrxml	2012-12-03 17:55:53 +0000
+++ resources/jrxml/data_analysis_usage_stats.jrxml	2013-04-07 21:25:18 +0000
@@ -9,6 +9,8 @@
   select count(distinct userid) from map ) as mapusers, (
   select count(*) from chart ) as charts, (
   select count(distinct userid) from chart ) as chartusers, (
+  select count(*) from reporttable ) as reporttables, (
+  select count(*) from usergroup ) as usergroups, (
   select count(*) from interpretation ) as interpretations, (
   select count(*) from interpretation_comments ) as comments, (
   select count(*) from usersetting where name='dashboardConfig' ) as dashboards, (
@@ -26,6 +28,8 @@
 	<field name="mapusers" class="java.lang.Long"/>
 	<field name="charts" class="java.lang.Long"/>
 	<field name="chartusers" class="java.lang.Long"/>
+	<field name="reporttables" class="java.lang.Long"/>
+	<field name="usergroups" class="java.lang.Long"/>
 	<field name="interpretations" class="java.lang.Long"/>
 	<field name="comments" class="java.lang.Long"/>
 	<field name="dashboards" class="java.lang.Long"/>
@@ -36,7 +40,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="370" splitType="Stretch">
+		<band height="423" splitType="Stretch">
 			<staticText>
 				<reportElement uuid="20210923-852e-4e3c-9007-b5e26098a416" x="205" y="20" width="319" height="33"/>
 				<textElement>
@@ -80,14 +84,14 @@
 				<text><![CDATA[Chart distinct users]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="702c1830-259a-4b1a-bc3f-22d4ced65209" x="205" y="198" width="188" height="20"/>
+				<reportElement uuid="702c1830-259a-4b1a-bc3f-22d4ced65209" x="205" y="239" width="188" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
 				<text><![CDATA[Interpretations]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="218" width="188" height="20"/>
+				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="259" width="188" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
@@ -115,70 +119,70 @@
 				<textFieldExpression><![CDATA[$F{chartusers}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a5eb2f14-6ae9-442a-8737-bfd21c3552ad" x="393" y="198" width="131" height="20"/>
+				<reportElement uuid="a5eb2f14-6ae9-442a-8737-bfd21c3552ad" x="393" y="239" width="131" height="20"/>
 				<textElement>
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{interpretations}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="939900f9-ed9a-40fa-88a8-e575944a279e" x="393" y="218" width="131" height="20"/>
+				<reportElement uuid="939900f9-ed9a-40fa-88a8-e575944a279e" x="393" y="259" width="131" height="20"/>
 				<textElement>
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{comments}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4f4cbe49-5474-4fce-bf76-88ac27c72f05" x="393" y="279" width="131" height="20"/>
+				<reportElement uuid="4f4cbe49-5474-4fce-bf76-88ac27c72f05" x="393" y="320" width="131" height="20"/>
 				<textElement>
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{users}]]></textFieldExpression>
 			</textField>
 			<staticText>
+				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="320" width="188" height="20"/>
+				<textElement>
+					<font size="11"/>
+				</textElement>
+				<text><![CDATA[Users total]]></text>
+			</staticText>
+			<staticText>
 				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="279" width="188" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
-				<text><![CDATA[Users total]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="238" width="188" height="20"/>
-				<textElement>
-					<font size="11"/>
-				</textElement>
 				<text><![CDATA[Messages and comments]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="74405f58-92f3-4bbc-af17-585b52bd835d" x="393" y="238" width="131" height="20"/>
+				<reportElement uuid="74405f58-92f3-4bbc-af17-585b52bd835d" x="393" y="279" width="131" height="20"/>
 				<textElement>
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{messages}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b86c5db4-009f-4643-b6aa-e009501abeab" x="393" y="258" width="131" height="20"/>
+				<reportElement uuid="b86c5db4-009f-4643-b6aa-e009501abeab" x="393" y="299" width="131" height="20"/>
 				<textElement>
 					<font size="11" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dashboards}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="258" width="188" height="20"/>
+				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="299" width="188" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
 				<text><![CDATA[Dashboards set up]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="4803d3a3-8fd7-4807-b738-6bb12cea15c9" x="393" y="299" width="131" height="20"/>
+				<reportElement uuid="4803d3a3-8fd7-4807-b738-6bb12cea15c9" x="393" y="340" width="131" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{profiles}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="299" width="188" height="20"/>
+				<reportElement uuid="ff90bdf5-fffa-4112-a3fc-26dbf63e412d" x="205" y="340" width="188" height="20"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
@@ -191,6 +195,34 @@
 				</textElement>
 				<text><![CDATA[(Saved favorites by type)]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="65c88e84-cc59-4e2f-9635-a0bc110b4380" x="205" y="198" width="188" height="20"/>
+				<textElement>
+					<font size="11"/>
+				</textElement>
+				<text><![CDATA[Report tables]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="65c88e84-cc59-4e2f-9635-a0bc110b4380" x="205" y="218" width="188" height="20"/>
+				<textElement>
+					<font size="11"/>
+				</textElement>
+				<text><![CDATA[User groups]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="e0fc648b-eef4-42b0-b856-8be4f7aef4f6" x="393" y="198" width="131" height="20"/>
+				<textElement>
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{reporttables}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="e0fc648b-eef4-42b0-b856-8be4f7aef4f6" x="393" y="218" width="131" height="20"/>
+				<textElement>
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{usergroups}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>