Skip to content

Commit

Permalink
Version 1.2.0.48.1 :
Browse files Browse the repository at this point in the history
-----------------
## New Features
   Added findDocumentsByAutoFilter
## Features removed
## Other Changes
   Moved to UPA 1.2.48.1
## Bug Fixes
   Fixed JSON serialization of Document
  • Loading branch information
vpc committed Sep 7, 2018
1 parent 68c02ef commit b3b7d50
Show file tree
Hide file tree
Showing 79 changed files with 796 additions and 243 deletions.
6 changes: 3 additions & 3 deletions apps/eniso-info/app/eniso-info-app-service/pom.xml
Expand Up @@ -5,19 +5,19 @@
<groupId>net.vpc.app.vain-ruling.apps.eniso-info</groupId>
<artifactId>eniso-info-app-service</artifactId>
<name>net.vpc.app.vain-ruling.apps.eniso-info.eniso-info-app-service</name>
<version>1.13.10</version>
<version>1.13.11</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<version.vr-core-service>1.13.10</version.vr-core-service>
<version.vr-core-service>1.13.11</version.vr-core-service>
</properties>
<dependencies>
<dependency>
<groupId>net.vpc.app.vain-ruling.apps.eniso-info.plugins</groupId>
<artifactId>eniso-info-main-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions apps/eniso-info/app/eniso-info-app-web/pom.xml
Expand Up @@ -47,20 +47,20 @@
<maven.compiler.target>1.8</maven.compiler.target>
<github.global.server>github</github.global.server>
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
<version.vr-core-web-jsf>1.13.10</version.vr-core-web-jsf>
<version.vr-core-web-jsf>1.13.11</version.vr-core-web-jsf>
</properties>

<dependencies>
<dependency>
<groupId>net.vpc.app.vain-ruling.apps.eniso-info.plugins</groupId>
<artifactId>eniso-info-main-web</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>

<dependency>
<groupId>net.vpc.app.vain-ruling.apps.eniso-info</groupId>
<artifactId>eniso-info-app-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Expand Down
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.vpc.app.vain-ruling.apps.eniso-info.plugins</groupId>
<artifactId>eniso-info-main-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
<packaging>jar</packaging>
<name>net.vpc.app.vain-ruling.apps.eniso-info.plugins.eniso-info-main-service</name>
<url>https://github.com/thevpc/vr/wiki</url>
Expand All @@ -20,10 +20,16 @@
<vr-plugin.component-type>service</vr-plugin.component-type>
<vr-plugin.name>ENISo Info Plugin</vr-plugin.name>
<vr-plugin.description>ENISo Info Plugin</vr-plugin.description>
<version.vr-core-service>1.13.10</version.vr-core-service>
<version.vr-core-service>1.13.11</version.vr-core-service>
<version.scholar>3.1.31</version.scholar>
</properties>

<dependencies>
<dependency>
<artifactId>hadrumaths</artifactId>
<groupId>net.vpc.scholar</groupId>
<version>${version.scholar}</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.core</groupId>
<artifactId>vr-core-service</artifactId>
Expand All @@ -32,32 +38,32 @@
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.equipments</groupId>
<artifactId>vr-equipments-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.equipment-tracker</groupId>
<artifactId>vr-equipment-tracker-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.tasks</groupId>
<artifactId>vr-tasks-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic</groupId>
<artifactId>vr-academic-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.mailbox</groupId>
<artifactId>vr-mailbox-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic-project-based-learning</groupId>
<artifactId>vr-academic-project-based-learning-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<!--<dependency>-->
<!--<groupId>net.vpc.app.vain-ruling.plugins.blog</groupId>-->
Expand All @@ -67,32 +73,32 @@
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.forum</groupId>
<artifactId>vr-forum-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic-report</groupId>
<artifactId>vr-academic-report-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic-perf-eval</groupId>
<artifactId>vr-academic-perf-eval-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic-planning</groupId>
<artifactId>vr-academic-planning-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.dev-toolbox</groupId>
<artifactId>vr-dev-toolbox-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>
<dependency>
<groupId>net.vpc.app.vain-ruling.plugins.academic-profile</groupId>
<artifactId>vr-academic-profile-service</artifactId>
<version>1.13.10</version>
<version>1.13.11</version>
</dependency>

</dependencies>
Expand Down
@@ -0,0 +1,79 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package net.vpc.app.vainruling.plugins.enisoinfo;

import java.util.Map;
import net.vpc.app.vainruling.plugins.enisoinfo.SchoolScorePlotUtils.Data;
import net.vpc.app.vainruling.plugins.enisoinfo.SchoolScorePlotUtils.DataKey;
import net.vpc.app.vainruling.plugins.enisoinfo.SchoolScorePlotUtils.DataSeries;

public class EnisoRangsPrepasPlotUtils {
public static Map<DataKey, Data> data = SchoolScorePlotUtils.loadDataMapResource("/scores.txt");


public static void main(String[] args) {
y2018();
// gte_all();
// ia_all();
// y2017GTE();
}


public static Data get(String program,String spec,int year){
Data d = data.get(new DataKey(year, spec, program));
if(d==null){
throw new IllegalArgumentException("Not found "+program+" "+spec+" "+year);
}
return d;
}

public static void y2018() {
double[] years = new double[]{2017, 2017};
DataSeries MP = new DataSeries("MP", years, get("IA","MP",2018), get("GTE","MP",2018), get("MEC","MP",2018), get("EI","MP",2018), get("GMP","MP",2018));
DataSeries PT = new DataSeries("PT", years, get("IA","PT",2018), get("GTE","PT",2018), get("MEC","PT",2018), get("EI","PT",2018), get("GMP","PT",2018));
// DataSeries PT = new DataSeries("PT", years, get("IA","PT",2017), get("GTE","PT",2017));
SchoolScorePlotUtils.show(MP, PT);
}
public static void y2017() {
double[] years = new double[]{2017, 2017};
DataSeries MP = new DataSeries("MP", years, get("IA","MP",2017), get("GTE","MP",2017));
DataSeries PT = new DataSeries("PT", years, get("IA","PT",2017), get("GTE","PT",2017));
SchoolScorePlotUtils.show(MP, PT);
}

public static void y2017GTE() {
double[] years = new double[]{2017, 2017};
DataSeries MP = new DataSeries("MP", years, get("GTE","MP",2017));
DataSeries PT = new DataSeries("PT", years, get("GTE","PT",2017));
SchoolScorePlotUtils.show(MP, PT);
}

public static void ia15() {
// IA_MP_2013,IA_MP_2014,
// IA_PT_2013,IA_PT_2014,
// 2013,2014,
double[] years = new double[]{2015, 2016, 2017, 2017,2018};
DataSeries MP = new DataSeries("MP", years, get("IA","MP",2015), get("IA","MP",2016), get("IA","MP",2017), get("IA","MP",2018));
DataSeries PT = new DataSeries("PT", years, get("IA","PT",2015), get("IA","PT",2016), get("IA","PT",2017), get("IA","PT",2018));
SchoolScorePlotUtils.show(MP, PT);
}

public static void ia_all() {
double[] years = new double[]{2014, 2015, 2016, 2017, 2018};
DataSeries MP = new DataSeries("MP", years, get("IA","MP",2014), get("IA","MP",2015), get("IA","MP",2016), get("IA","MP",2017), get("IA","MP",2018));//, GTE_MP_2017
DataSeries PT = new DataSeries("PT", years, get("IA","PT",2014), get("IA","PT",2015), get("IA","PT",2016), get("IA","PT",2017), get("IA","PT",2017));//, GTE_PT_2017
SchoolScorePlotUtils.show(MP, PT);
}

public static void gte_all() {
double[] years = new double[]{2017, 2018};
DataSeries MP = new DataSeries("MP", years, get("GTE","MP",2017), get("GTE","MP",2018));
DataSeries PT = new DataSeries("PT", years, get("GTE","PT",2017), get("GTE","PT",2017));
SchoolScorePlotUtils.show(MP, PT);
}


}

0 comments on commit b3b7d50

Please sign in to comment.