Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect OS for npm install #429

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Detect OS for npm install #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e7e4c02
UTF-8 Encoding for POST-Requests
Apr 9, 2020
f45ea51
apply language switch test
biodivAtlasAT Nov 12, 2020
f881fe8
apply language switch test
biodivAtlasAT Nov 12, 2020
641f669
apply language switch test
biodivAtlasAT Nov 12, 2020
6c4b79d
i18n test rollback
biodivAtlasAT Nov 13, 2020
8cd654e
i18n progress 01
biodivAtlasAT Nov 23, 2020
2fd2999
Merge remote-tracking branch 'origin/master'
biodivAtlasAT Nov 23, 2020
44b813f
i18n progress 02
biodivAtlasAT Nov 23, 2020
d998090
commit funktion for i18nService rollback
biodivAtlasAT Nov 23, 2020
d767d42
added language switch to menu-config
biodivAtlasAT Oct 6, 2021
49a9319
i18n for all languages
biodivAtlasAT Oct 27, 2021
7e3d986
detecting OS for npm issue
biodivAtlasAT Oct 29, 2021
3a0ef7d
revert os Detection for branch
biodivAtlasAT Oct 29, 2021
14dde3f
OS Detection for Windows and Linux Unix MACOS
biodivAtlasAT Oct 29, 2021
3322ba8
Merge branch 'master' of https://github.com/AtlasOfLivingAustralia/sp…
biodivAtlasAT Oct 29, 2021
4dd235d
OS Detection for Windows and Linux Unix MACOS
biodivAtlasAT Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ node_modules
grails-app/assets/compile/

grails-app/conf/application-backup.yml
/.asscache
/npm-debug.log
12 changes: 12 additions & 0 deletions .jpb/persistence-units.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PersistenceUnitSettings">
<persistence-units>
<persistence-unit name="Default">
<packages>
<package value="" />
</packages>
</persistence-unit>
</persistence-units>
</component>
</project>
3 changes: 2 additions & 1 deletion _Events.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def build(String baseDir) {
print(label)
def newCount = 0

String input = FileUtils.readFileToString(f)
String input = FileUtils.readFileToString(f)

def output = new StringBuilder()

Expand Down Expand Up @@ -325,6 +325,7 @@ def findLastIndex(directory, startString, endString) {
last_idx = Math.max(last_idx, Integer.parseInt(value))
}
}
}

start = next + 1
} else {
Expand Down
2 changes: 1 addition & 1 deletion embedExample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
'https://collections.ala.org.au/**',
'http://phylolink.ala.org.au/**'
],
i18n: 'default',
i18n: 'de',
editable: false
};
</script>
Expand Down
Binary file added gradle-base-services-1.0.jar.zip
View file
Open in desktop
Binary file not shown.
Binary file added gradle-base-services-1.0.jar/gradle-base-services-1.0.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion grails-app/assets/javascripts/spApp/controller/toolCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
if (value.type === 'species') {
c.splice(parseInt(k) + 1, 0, {
type: "date",
description: "Select date range",
description: $i18n(531),
name: '_date'
})
}
Expand Down
2 changes: 1 addition & 1 deletion grails-app/assets/javascripts/spApp/service/facetAutoCompleteService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
}
}
list.unshift({
title: $i18n("Other"),
title: $i18n(22),
facets: dynamicList
})
}
Expand Down
22 changes: 20 additions & 2 deletions grails-app/assets/javascripts/spApp/service/menuService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,29 @@

return httpconfig;
};

//TODO: support dynamic menu update

/*
if ($SH.menu.indexOf('http') == 0) {
var setup = $http.get($SH.menu, _httpDescription('getMenu')).then(function (data) {
menuConfig = data.data;
return menuConfig;
});
} else {
menuConfig = $SH.menu;
setup = $q.when(menuConfig)
}
*/
//TODO: support dynamic menu update
if ($SH.menu.indexOf('http') == 0) {
var setup = $http.get($SH.menu, _httpDescription('getMenu')).then(function (data) {
var it_0 = 0;
var it_1 = 0;
for(it_0 = 0; it_0 < data.data.length; it_0++) {
data.data[it_0].name = $i18n(data.data[it_0].i18nNr);
for(it_1 = 0; it_1 < data.data[it_0].items.length; it_1++) {
data.data[it_0].items[it_1].name = $i18n(data.data[it_0].items[it_1].i18nNr);
}
}
menuConfig = data.data;
return menuConfig;
});
Expand Down
2 changes: 1 addition & 1 deletion grails-app/assets/javascripts/spApp/service/predefinedAreasService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}

return [
MapService.newArea($i18n("Current extent"),
MapService.newArea($i18n(16),
["longitude:[" + extents[0] + " TO " + extents[2] + "]", "latitude:[" + extents[1] + " TO " + extents[3] + "]"],
'POLYGON((' + extents[0] + ' ' + extents[3] + ',' + extents[0] + ' ' + extents[1] + ',' +
extents[2] + ' ' + extents[1] + ',' + extents[2] + ' ' + extents[3] + ',' +
Expand Down
4 changes: 2 additions & 2 deletions grails-app/assets/javascripts/spApp/service/toolAddLayerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
spec: {
"input": [
{
"description": "Select layers.",
"description": $i18n(298),
"type": "layer",
"constraints": {
"min": 1,
"optional": false
}
}],
"description": "Add environmental and contextual layers to the map."
"description": $i18n(415)
},

execute: function (inputs) {
Expand Down
9 changes: 5 additions & 4 deletions grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
return {

// Override text with view-config.json
// Im Moment nur deutsche Internationalisierung
spec: {
"input": [
{
"name": "species",
"description": "Select species.",
"description": $i18n(416),
"type": "species",
"constraints": {
"min": 1,
Expand All @@ -30,7 +31,7 @@
},
{
"name": "speciesOptions",
"description": "Include related areas.",
"description": $i18n(417),
"type": "speciesOptions",
"constraints": {
"optional": true,
Expand All @@ -41,15 +42,15 @@
},
{
"name": "area",
"description": "Restrict to an area.",
"description": $i18n(418),
"type": "area",
"constraints": {
"min": 1,
"max": 1,
"defaultToWorld": true
}
}],
"description": "Add a species layer to the map"
"description": $i18n(419)
},


Expand Down
4 changes: 2 additions & 2 deletions grails-app/assets/javascripts/spApp/service/toolAreaReportService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
spec: {
"input": [
{
"description": $i18n("Select area."),
"description": $i18n(352),
"type": "area",
"constraints": {
"min": 1,
"max": 1,
"optional": false
}
}],
"description": $i18n("Area Report")
"description": $i18n(353)
},

execute: function (inputs) {
Expand Down
12 changes: 6 additions & 6 deletions grails-app/assets/javascripts/spApp/service/toolExportAreaService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
spec: {
"input": [
{
"description": "Select areas.",
"description": $i18n(420),
"type": "area",
"constraints": {
"min": 1,
Expand All @@ -25,7 +25,7 @@
}
},
{
"description": "Filetype.",
"description": $i18n(421),
"type": "list",
"constraints": {
"default": "Shapefile",
Expand All @@ -41,26 +41,26 @@
}],
"view": [
{
"name": "Select areas to export.",
"name": $i18n(422),
"inputs": [
"area"
]
},
{
"name": "Select filetype.",
"name": $i18n(423),
"inputs": [
"layer"
]
},
{
"name": "Number of groups and Shapefile generation",
"name": $i18n(424),
"inputs": [
"groups",
"shp"
]
}
],
"description": "Export areas."
"description": $i18n(425)
},

execute: function (inputs) {
Expand Down
6 changes: 3 additions & 3 deletions grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
spec: {
"input": [
{
"description": "Restrict to an area.",
"description": $i18n(418),
"type": "area",
"constraints": {
"min": 1,
Expand All @@ -24,7 +24,7 @@
}
},
{
"description": "Species options.",
"description": $i18n(411),
"type": "speciesOptions",
"constraints": {
"areaIncludes": false,
Expand All @@ -33,7 +33,7 @@
"absentOption": true
}
}],
"description": "Export a species list."
"description": $i18n(426)
},

downloading: false,
Expand Down
6 changes: 3 additions & 3 deletions grails-app/assets/javascripts/spApp/service/toolExportMapService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"input": [
{
"name": "caption",
"description": "Enter a map caption.",
"description": $i18n(530),
"type": "text",
"constraints": {
"optional": true
}
},
{
"name": "format",
"description": "Select an image format.",
"description": $i18n(529),
"type": "list",
"constraints": {
"default": "png",
Expand All @@ -39,7 +39,7 @@
}

}],
"description": "Export areas."
"description": $i18n(425)
},

execute: function (inputs) {
Expand Down
8 changes: 4 additions & 4 deletions grails-app/assets/javascripts/spApp/service/toolExportSampleService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"input": [
{
"name": "area",
"description": "Select area.",
"description": $i18n(420),
"type": "area",
"constraints": {
"min": 1,
Expand All @@ -34,7 +34,7 @@
},
{
"name": "species",
"description": "Select species.",
"description": $i18n(416),
"type": "species",
"constraints": {
"min": 1,
Expand All @@ -46,15 +46,15 @@
},
{
"name": "layers",
"description": "Select layers.",
"description": $i18n(414),
"type": "layer",
"constraints": {
"min": 1,
"optional": true
}
}
],
"description": "Export points."
"description": "Punkte exportieren."
},

execute: function (inputs) {
Expand Down
2 changes: 1 addition & 1 deletion grails-app/assets/javascripts/spApp/templates/toolContent.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h3 class="panel-title">{{stepCount[idx - 1] + $index + 1}}.&nbsp{{sv.name !== u
<div ng-show="getInputChecks(i)"
style="float:right;font-size:15px;color:red;margin-top:-20px;">
<i class="glyphicon glyphicon-asterisk"></i>
Mandatory.
<span i18n="42">Mandatory.</span>
</div>
</div>
<div class="panel-body" ng-style="v.constraints.disable && {'display':'none'}">
Expand Down
6 changes: 3 additions & 3 deletions grails-app/assets/stylesheets/spatial-hub-generic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,8 @@ section#breadcrumb {
}

section#breadcrumb li + li::before {
content: "\f105";
font-family: FontAwesome;
/* content: "\f105";
font-family: FontAwesome; */
margin: 0 .6em;
height: .8em;
opacity: .6;
Expand Down Expand Up @@ -1810,7 +1810,7 @@ input[type="date"] {
top: 0;
right: 0;
bottom: 0;
left: 0;
left: auto;
z-index: 1050;
-webkit-overflow-scrolling: touch;
outline: 0;
Expand Down
2 changes: 2 additions & 0 deletions grails-app/conf/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ grails:
- file:/data/spatial-hub/config/spatial-hub-config.properties
- file:/data/spatial-hub/config/spatial-hub-config.yml
- file:/data/spatial-hub/config/spatial-hub-config.groovy
# - file:C:\\Users\\Georg Neubauer\\IdeaProjects\\REMDB_2021_servers\\backups_30_09_2021\\data\\spatial-hub\\config\\spatial-hub-config.yml
# - file:D:\\reinhardt\\firma\\Biodiversity\\working\\data\\spatial-hub\\spatial-hub-config.yml
spring:
transactionManagement:
proxies: false
Expand Down
Loading