lkrsnik/list
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Solar grand fix.

Browse Source
This commit is contained in:
Luka
2019-01-11 13:00:42 +01:00
parent 9ee5ab9afc
commit 2d7d5169cc
17 changed files with 262 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/data/Corpus.java
View File

@@ -30,6 +30,7 @@ public class Corpus {
private ArrayList<Taxonomy> taxonomy; // if gigafida or gos
private Taxonomy taxonomyTotal;
private HashMap<String, ObservableList<String>> solarFilters; // if solar
public HashMap<String, ObservableList<String>> solarSelectedFilters; // if solar selected
private HashMap<String, HashSet<String>> solarFiltersForXML; // if solar - used while parsing xml
private boolean gosOrthMode;
boolean hasMsdData;
@@ -98,8 +99,10 @@ public class Corpus {
public ObservableList<String> getObservableListTaxonomy() {
ArrayList<String> al = new ArrayList<>();
for (Taxonomy t : this.taxonomy){
al.add(t.toLongNameString());
if(taxonomy != null) {
for (Taxonomy t : this.taxonomy) {
al.add(t.toLongNameString());
}
}
return FXCollections.observableArrayList(al);
}
@@ -126,6 +129,15 @@ public class Corpus {
logger.info("Corpus.set: ", solarFilters);
}
public HashMap<String, ObservableList<String>> getSolarSelectedFilters() {
return solarSelectedFilters;
}
public void setSolarSelectedFilters(HashMap<String, ObservableList<String>> solarFilters) {
this.solarSelectedFilters = solarFilters;
logger.info("Corpus.set: ", solarFilters);
}
public HashMap<String, HashSet<String>> getSolarFiltersForXML() {
return solarFiltersForXML;
}

12
src/main/java/data/Enums/solar/SolarFilters.java
View File

@@ -9,12 +9,12 @@ import javafx.collections.ObservableList;
public class SolarFilters {
private static HashMap<String, ObservableList<String>> SOLAR_FILTERS;
public static final String SOLA = "sola";
public static final String PREDMET = "predmet";
public static final String RAZRED = "razred";
public static final String REGIJA = "regija";
public static final String TIP = "tip";
public static final String LETO = "leto";
public static final String SOLA = "filter.solarSola";
public static final String PREDMET = "filter.solarPredmet";
public static final String RAZRED = "filter.solarRazred";
public static final String REGIJA = "filter.solarRegija";
public static final String TIP = "filter.solarVrstaBesedila";
public static final String LETO = "filter.solarLeto";
static {
SOLAR_FILTERS = new HashMap<>();

4
src/main/java/data/StatisticsNew.java
View File

@@ -636,13 +636,13 @@ public class StatisticsNew {
info.put(I18N.get("exportHeader.minTaxonomies"), String.valueOf(filter.getMinimalTaxonomy()));
if (corpus.getCorpusType() == CorpusType.SOLAR) {
HashMap<String, ObservableList<String>> filters = corpus.getSolarFilters();
HashMap<String, ObservableList<String>> filters = corpus.getSolarSelectedFilters();
if (!isEmpty(filters)) {
info.put(I18N.get("exportHeader.additionalFilters"), "");
for (Map.Entry<String, ObservableList<String>> f : filters.entrySet()) {
info.put(f.getKey(), StringUtils.join(f.getValue(), ", "));
info.put(I18N.get(f.getKey() + "L"), StringUtils.join(f.getValue(), ", "));
}
}
}