Skip to content

Commit

Permalink
Merge pull request #3 from EU-OSHA/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
dprado002 authored Apr 12, 2022
2 parents 7ea77a0 + e585536 commit 49dd9db
Show file tree
Hide file tree
Showing 271 changed files with 52,402 additions and 16,141 deletions.
51 changes: 2 additions & 49 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,3 @@
Authors
Data Visualisation Tool - ILO
========
Data Visualisation Tool (DVT) for EU-OSHA
2016 by Zylk.net + Bilbomatica


Setup
========

1. pentaho 6 installation

2. pentaho 6 extension
add all resources in /resources-ext/pentaho-610-extension within the pentaho 6 installation, as an extension or override

3. solution link to filesystem
link source folder to pentaho solution as 'dvt-framework' (case-sensitive)
ln -s ${src}/dvt-framework/ ${biserver}/pentaho-solutions/system/dvt-framework

4. database

database creation 'osha_dvt_allages', import and association in the server with the name 'jdbcEuOshaAllAges'
> create database osha_dvt_allages character set utf8;
> source /dvt-framework/resources-ext/dbdump/osha_dvt_allages.sql
OR

link to osha.zylk.net environment (intranet only)

5. change env to localhost
${src}dvt-framework/static/custom/modules/horizontal/config/environment.json

5.
Check the gulp tasks:
Maybe automated with yeoman on near future.

- This two tasks must be triggered, before see the dashboard with styles
* dvt-sass
* bootstrap-sass

- This two tasks generate & show ngdoc documentation, the second build it up on 8083 port.
* documentation
* documentation_connect

- This two tasks clean & minify the source of the project. our code not pentaho's code. Only use it, if on environment.json packed is true.
* clean-min
* package

- ** Under development ** Generate $templateCache template for better performance, the task generate the code but not linked to dashboard yet.
* html-horizontal-templates
* html-vertical-templates
EU-OSHA - 2017
12 changes: 5 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "dvt-framework",
"description": "DVT Framework",
"name": "osha-dvt-ilo",
"description": "DVT ILO",
"main": [
"static/custom/app.js"
],
"dependencies": {
"angular": "~1.4.0",
"angular-animate": "~1.5.0",
"angular-ui-router": "~0.2.15",
"ui-router-metatags":"~1.0.3",
"angular-bootstrap": "~1.3.3",
"angular-bootstrap-affix": "~0.2.2",
"angular-scroll": "^1.0.0",
Expand All @@ -17,7 +18,7 @@
"bootstrap-sass": "~3.3.6",
"classlist": "",
"html2canvas":"^v0.5.0-beta4",
"file-saver": "^1.3.3",
"file-saver": "1.3.3",
"font-awesome": "~4.5.0",
"angular-cookies": "~1.5.8",
"angular-consent": "~2.0.0",
Expand All @@ -37,10 +38,7 @@
"dvt"
],
"authors": [
"Zylk.net",
"Irune Prado <iprado@zylk.net>",
"Iñigo Sanchez <isanchez@zylk.net>",
"Sergio Argerey <sargerey@zylk.net>"
""
],
"license": "???",
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project.version=
project.revision=${project.stage}-${project.version}
# Version: a numeric value or SNAPSHOT. SNAPSHOT is replaced by DSTAMP
package.url=not defined
ivy.artifact.id=dvt-framework
ivy.artifact.id=osha-dvt-ilo
ivy.artifact.group=
impl.title=
project.description=
Expand Down
6 changes: 3 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<project name="dvt-framework" basedir="." default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
<project name="osha-dvt-ilo" basedir="." default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
This build file is used to create the dvt-framework project and works with the common_build.xml file.
This build file is used to create the osha-dvt-ilo project and works with the common_build.xml file.
</description>
<!-- Import the common_build.xml file which contains all the default tasks -->
<import file="build-res/subfloor-pkg.xml" id="subfloor" />
<property name="plugin.name" value="dvt-framework" description="Name of the plugin" />
<property name="plugin.name" value="osha-dvt-ilo" description="Name of the plugin" />
<property name="stage.dir" value="${bin.dir}/stage" description="Name of the resource directory" />
<tstamp/>
<!-- Build the project.revision property -->
Expand Down
4 changes: 2 additions & 2 deletions cpk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</elementTypes>
<info>
<CPK_version>5</CPK_version>
<name>All ages</name>
<creation_date>2015-09-17</creation_date>
<name>ILO</name>
<creation_date>2017-05-03</creation_date>
</info>
</cpk>
9 changes: 0 additions & 9 deletions dashboards/README

This file was deleted.

16 changes: 0 additions & 16 deletions dashboards/allagesdash.cda

This file was deleted.

2 changes: 0 additions & 2 deletions dashboards/allagesdash.wcdf

This file was deleted.

178 changes: 0 additions & 178 deletions dashboards/approachdata.cda

This file was deleted.

Loading

0 comments on commit 49dd9db

Please sign in to comment.