Skip to content

Commit

Permalink
repiar report templates
Browse files Browse the repository at this point in the history
  • Loading branch information
garbika committed May 26, 2014
1 parent e33d33f commit 34fa559
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 62 deletions.
7 changes: 2 additions & 5 deletions gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
View file
Expand Up @@ -19,10 +19,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
oid="00000000-0000-0000-0000-000000000107"
version="0">
<name>
<orig xmlns="http://prism.evolveum.com/xml/ns/public/types-3">User accounts subreport</orig>
<norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">user accounts subreport</norm>
</name>
<name>User accounts subreport</name>
<description>User accounts subreport for midpoint users.</description>
<!-- flag if this report is "parent" report, used for gui -->
<parent>false</parent>
Expand All @@ -46,7 +43,7 @@
from RObjectReference as o,
RShadow as s,
RResource as r
where s.resourceRef.targetOid = r.oid and o.owner.oid = $P{userOid} and o.type = 7 and o.targetOid = s.oid and s.kind = 0
where s.resourceRef.targetOid = r.oid and o.owner.oid = $P{userOid} and o.type = 6 and o.targetOid = s.oid and s.kind = 0
order by r.name.orig, s.name.orig
</r:hqlQueryAccounts>
</configuration>
Expand Down
7 changes: 2 additions & 5 deletions gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
View file
Expand Up @@ -19,10 +19,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
oid="00000000-0000-0000-0000-000000000108"
version="0">
<name>
<orig xmlns="http://prism.evolveum.com/xml/ns/public/types-3">User orgs subreport</orig>
<norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">user orgs subreport</norm>
</name>
<name>User orgs subreport</name>
<description>User orgs subreport for midpoint users.</description>
<!-- flag if this report is "parent" report, used for gui -->
<parent>false</parent>
Expand All @@ -44,7 +41,7 @@
select o.displayName.orig as orgName
from RAssignment as a,
ROrg as o
where a.targetRef.type = 18 and a.targetRef.targetOid = o.oid and a.owner.oid = $P{userOid}
where a.targetRef.type = 15 and a.targetRef.targetOid = o.oid and a.owner.oid = $P{userOid}
</r:hqlQueryOrgs>
</configuration>
<!-- report parameters configuration schema sample with different options -->
Expand Down
7 changes: 2 additions & 5 deletions gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
View file
Expand Up @@ -19,10 +19,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
oid="00000000-0000-0000-0000-000000000109"
version="0">
<name>
<orig xmlns="http://prism.evolveum.com/xml/ns/public/types-3">User roles subreport</orig>
<norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">user roles subreport</norm>
</name>
<name>User roles subreport</name>
<description>User roles subreport for midpoint users.</description>
<!-- flag if this report is "parent" report, used for gui -->
<parent>false</parent>
Expand All @@ -43,7 +40,7 @@
<r:hqlQueryRoles>
select r.name.orig as roleName
from RAssignment as a, RRole as r
where a.targetRef.type = 8 and a.targetRef.targetOid = r.oid and a.owner.oid = $P{userOid}
where a.targetRef.type = 7 and a.targetRef.targetOid = r.oid and a.owner.oid = $P{userOid}
</r:hqlQueryRoles>
</configuration>
<!-- report parameters configuration schema sample with different options -->
Expand Down
48 changes: 1 addition & 47 deletions gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
View file
Expand Up @@ -19,10 +19,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
oid="00000000-0000-0000-0000-000000000110"
version="0">
<name>
<orig xmlns="http://prism.evolveum.com/xml/ns/public/types-3">Users in MidPoint</orig>
<norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">users in midpoint</norm>
</name>
<name>Users in MidPoint</name>
<description>Users listed in MidPoint.</description>
<!-- flag if this report is "parent" report, used for gui -->
<parent>true</parent>
Expand Down Expand Up @@ -109,8 +106,6 @@
where $P{activation} = null or u.activation.administrativeStatus = $P{activation}
order by u.name.orig
</r:hqlQuery>
<!--<r:activation>nu</r:activation>
<r:activationDescription>Disabled</r:activationDescription> -->
</configuration>
<!-- report parameters configuration schema sample with different options -->
<configurationSchema>
Expand All @@ -136,49 +131,8 @@
<xsd:sequence>
<!-- HQL query for jasper design (queryString element) -->
<xsd:element name="hqlQuery" type="xsd:string"/>

<xsd:element name="activation" type="r:ActivationStatus">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Activation ID:</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>

<xsd:element name="activationDescription" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>Activation description:</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>

<xsd:simpleType name="ActivationStatus">
<xsd:restriction base="xsd:int">
<xsd:enumeration value="null">
<xsd:annotation>
<xsd:appinfo>All</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="0">
<xsd:annotation>
<xsd:appinfo>Enabled</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="1">
<xsd:annotation>
<xsd:appinfo>Disabled</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="2">
<xsd:annotation>
<xsd:appinfo>Archived</xsd:appinfo>
</xsd:annotation>
</xsd:enumeration>
</xsd:restriction>
</xsd:simpleType>
<xsd:element name="configuration" type="r:ConfigurationType"/>
</xsd:schema>
</definition>
Expand Down

0 comments on commit 34fa559

Please sign in to comment.