Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
autorensystem
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MOTIVATE
autorensystem
Commits
bcf5effd
Commit
bcf5effd
authored
9 years ago
by
hjank
Browse files
Options
Downloads
Patches
Plain Diff
+ in fillParameterSelection(): added check for coordinates as condition for map display
parent
2264ac45
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/authoring/controllers/contextInfoController.js
+2
-1
2 additions, 1 deletion
js/authoring/controllers/contextInfoController.js
js/authoring/controllers/tabs/contextTabController.js
+8
-17
8 additions, 17 deletions
js/authoring/controllers/tabs/contextTabController.js
with
10 additions
and
18 deletions
js/authoring/controllers/contextInfoController.js
+
2
−
1
View file @
bcf5effd
...
...
@@ -16,7 +16,7 @@ function checkInformation() {
var
selectedContextInfo
=
$
(
"
#selectContextInfos
"
).
select2
(
"
data
"
);
var
selectedOperator
=
$
(
"
#selectOperator
"
).
select2
(
"
data
"
);
var
contextInfoInArray
=
contextList
.
getItem
(
selectedContextInfo
.
id
)
;
var
contextInfoInArray
;
// check selection bar "Kontextinformationen"
...
...
@@ -25,6 +25,7 @@ function checkInformation() {
missing_content
+=
"
- Kontextinformation
\n
"
;
}
else
{
// update JSON structure
contextInfoInArray
=
contextList
.
getItem
(
selectedContextInfo
.
id
);
selectedInfo
.
id
=
selectedContextInfo
.
id
;
selectedInfo
.
name
=
contextInfoInArray
.
name
;
selectedInfo
.
text
=
translate_contextInformation
(
contextInfoInArray
.
name
);
...
...
This diff is collapsed.
Click to expand it.
js/authoring/controllers/tabs/contextTabController.js
+
8
−
17
View file @
bcf5effd
...
...
@@ -414,6 +414,8 @@ function fillInputField(ciValue) {
* */
function
fillParameterSelection
(
cp
)
{
var
coordIdentRegex
=
/CP_.*
(
LONGITUDE|LONGITUDE
)
/
;
// clear selection bar
cleanSection
(
"
#selectParameter
"
);
cleanSection
(
"
#selectParameter2
"
);
...
...
@@ -479,7 +481,8 @@ function fillParameterSelection(cp) {
$
(
"
#divParameterSelection1
"
).
css
(
"
display
"
,
"
block
"
);
break
;
// type float needs one/two input fields and a specific label
// type float or integer each need an input field and a specific label
case
"
INTEGER
"
:
case
"
FLOAT
"
:
if
(
$
(
"
#divParameterInput1
"
).
css
(
"
display
"
)
==
"
table-cell
"
)
{
$
(
"
#divParameterInput2
"
).
css
(
"
display
"
,
"
table-cell
"
);
...
...
@@ -488,8 +491,10 @@ function fillParameterSelection(cp) {
setMinMaxDefault
(
possibleValues
[
0
],
$
(
"
#inputContextParameter2
"
));
// display google maps
$
(
"
#divMaps
"
).
css
(
"
display
"
,
"
block
"
);
resizeMap
();
if
(
coordIdentRegex
.
test
(
parameterOriginal
))
{
$
(
"
#divMaps
"
).
css
(
"
display
"
,
"
block
"
);
resizeMap
();
}
}
else
{
$
(
"
#divParameterInput1
"
).
css
(
"
display
"
,
"
table-cell
"
);
...
...
@@ -499,20 +504,6 @@ function fillParameterSelection(cp) {
}
break
;
// type integer needs one/two input fields and a specific label
case
"
INTEGER
"
:
if
(
$
(
"
#divParameterInput1
"
).
css
(
"
display
"
)
==
"
table-cell
"
)
{
$
(
"
#divParameterInput2
"
).
css
(
"
display
"
,
"
table-cell
"
);
$
(
"
#divParameterInput2
"
).
children
(
"
label
"
).
html
(
parameterTranslation
);
$
(
"
#divParameterInput2
"
).
children
(
"
label
"
).
attr
(
"
origin
"
,
parameterOriginal
);
}
else
{
$
(
"
#divParameterInput1
"
).
css
(
"
display
"
,
"
table-cell
"
);
$
(
"
#divParameterInput1
"
).
children
(
"
label
"
).
html
(
parameterTranslation
);
$
(
"
#divParameterInput1
"
).
children
(
"
label
"
).
attr
(
"
origin
"
,
parameterOriginal
);
}
break
;
// type string needs an input field and a specific label
case
"
STRING
"
:
$
(
"
#divParameterString
"
).
css
(
"
display
"
,
"
block
"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment