Commit ecf54cfc authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-refactoring' into 'dev' 

Actualiza campos y elimina referencias a OAG

See merge request redmic-project/server/library/reports!8
parents 32574959 1f446445

pom.xml

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic</groupId>

		<artifactId>server-parent</artifactId>

		<version>0.1.0</version>

		<version>0.3.0</version>

		<relativePath />

	</parent>
@@ -13,14 +13,14 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>reports</artifactId>

	<packaging>jar</packaging>

	<version>0.7.0</version>

	<version>0.7.0-feature-refactoring</version>

	<name>Reports</name>

	<description>Data reports library</description>



	<properties>

		<!-- REDMIC -->

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.models.version>0.12.0-feature-refactoring</redmic.models.version>

		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>



		<!-- OTHER -->

		<org.eclipse.birt.runtime.version>4.4.2</org.eclipse.birt.runtime.version>

resources/design/RedmicLibrary.rptlibrary

+16 −652

File changed.

Preview size limit exceeded, changes collapsed.

resources/design/administrative/DocumentInfoReport.rptdesign

+7 −7
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ 
                                <property name="dataType">float</property>

                            </structure>

                            <structure>

                                <property name="name">Keyword</property>

                                <text-property name="displayName">Keyword</text-property>

                                <expression name="expression" type="javascript">dataSetRow["Keyword"]</expression>

                                <property name="name">Keywords</property>

                                <text-property name="displayName">Keywords</text-property>

                                <expression name="expression" type="javascript">dataSetRow["Keywords"]</expression>

                                <property name="dataType">string</property>

                            </structure>

                            <structure>
@@ -217,9 +217,9 @@ 
                                <property name="dataType">string</property>

                            </structure>

                            <structure>

                                <property name="name">Note</property>

                                <text-property name="displayName">Note</text-property>

                                <expression name="expression" type="javascript">dataSetRow["Note"]</expression>

                                <property name="name">Remark</property>

                                <text-property name="displayName">Remark</text-property>

                                <expression name="expression" type="javascript">dataSetRow["Remark"]</expression>

                                <property name="dataType">string</property>

                            </structure>

                            <structure>
@@ -420,7 +420,7 @@ 
                            <list-property name="visibility">

                                <structure>

                                    <property name="format">all</property>

                                    <expression name="valueExpr" type="javascript">!row["Keyword"]</expression>

                                    <expression name="valueExpr" type="javascript">!row["Keywords"]</expression>

                                </structure>

                            </list-property>

                            <cell id="654">

src/test/resources/data/document1.json

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
		"year": 1998,

		"source": "Graellsia, 54: 143-168.",

		"language": "es",

		"keyword": "Canarias,REDMIC,Taxonomía",

		"note": "Nota",

		"keywords": "Canarias,REDMIC,Taxonomía",

		"remark": "Nota",

		"url": "/api/mediastorage/documents/BibOAG-03179.pdf",

		"inserted": "2014-12-19T13:09:58.311+00:00",

		"updated": "2016-08-16T13:48:40.401+01:00",