Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPS Observation App DEPRECATED
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
VIPS
VIPS Observation App DEPRECATED
Commits
cea14fc4
Commit
cea14fc4
authored
3 years ago
by
Bhabesh Bhabani Mukhopadhyay
Browse files
Options
Downloads
Patches
Plain Diff
Code comments
parent
4b207512
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/Observation.vue
+43
-29
43 additions, 29 deletions
src/components/Observation.vue
with
43 additions
and
29 deletions
src/components/Observation.vue
+
43
−
29
View file @
cea14fc4
<!--
This file is part of VIPS Observation App
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
Copyright (c) 2021 NIBIO <http://www.nibio.no/>
Author : Bhabesh Bhabani Mukhopadhyay
Email : bhabesh.mukhopadhyay@nibio.no
Dated : 19-Aug-2021
-->
<
template
>
<
template
>
<div
id=
"observation"
class=
"hello container"
>
<div
id=
"observation"
class=
"hello container"
>
<div
><router-link
id=
'btnBack'
class=
"btn btn-success "
to=
"/"
onclick=
"$('.offcanvas-collapse').toggleClass('open')"
>
{{
$t
(
"
prop.back.label
"
)
}}
</router-link></div>
<div
><router-link
id=
'btnBack'
class=
"btn btn-success "
to=
"/"
onclick=
"$('.offcanvas-collapse').toggleClass('open')"
>
{{
$t
(
"
prop.back.label
"
)
}}
</router-link></div>
...
@@ -338,14 +365,11 @@ export default {
...
@@ -338,14 +365,11 @@ export default {
let
lstObservations
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_OBSERVATION_LIST
));
// Observation List
let
lstObservations
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_OBSERVATION_LIST
));
// Observation List
/*
/*
Check availability of observation object
let lastQuoteRemoved = this.observation.observationData.slice(0,0);
- mainly from map component
console.log(lastQuoteRemoved);
- to hold crop, pest data
this.observation.observationData = lastQuoteRemoved.slice(0,0);
*/
console.log(this.observation.observationData);
*/
if
(
this
.
paramObservation
)
if
(
this
.
paramObservation
)
{
{
...
@@ -392,7 +416,7 @@ export default {
...
@@ -392,7 +416,7 @@ export default {
this
.
mapLocationPointOfInterestId
=
jsonObservation
.
locationPointOfInterestId
;
this
.
mapLocationPointOfInterestId
=
jsonObservation
.
locationPointOfInterestId
;
}
}
}
}
//this.observation.geoinfo = this.mapGeoinfo;
}
}
else
{
else
{
//TODO for new Observation
//TODO for new Observation
...
@@ -408,7 +432,7 @@ export default {
...
@@ -408,7 +432,7 @@ export default {
/** Try to get list of crops from crop category ids */
/** Try to get list of crops from crop category ids */
let
lstCropCategories
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_CATEGORY
));
let
lstCropCategories
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_CATEGORY
));
//let testCropIds = lstObservations.find(({cropOrganismIds})=> cropOrganismIds === this.observation.cropOrganismId);
/** For Selected Observation We require List of related crop ids for dropdown */
/** For Selected Observation We require List of related crop ids for dropdown */
// Iterating crop categories
// Iterating crop categories
...
@@ -434,7 +458,6 @@ export default {
...
@@ -434,7 +458,6 @@ export default {
this
.
getCrops
(
lstCropIds
);
this
.
getCrops
(
lstCropIds
);
let
jsonSelectedCrop
=
this
.
crops
.
find
(({
organismId
})
=>
organismId
===
parseInt
(
jsonObservation
.
cropOrganismId
));
let
jsonSelectedCrop
=
this
.
crops
.
find
(({
organismId
})
=>
organismId
===
parseInt
(
jsonObservation
.
cropOrganismId
));
// this.crops = lstCrops;
if
(
jsonSelectedCrop
)
if
(
jsonSelectedCrop
)
{
{
this
.
crop
=
{
"
cropId
"
:
jsonSelectedCrop
.
organismId
,
"
cropName
"
:
jsonSelectedCrop
.
latinName
};
this
.
crop
=
{
"
cropId
"
:
jsonSelectedCrop
.
organismId
,
"
cropName
"
:
jsonSelectedCrop
.
latinName
};
...
@@ -496,12 +519,10 @@ export default {
...
@@ -496,12 +519,10 @@ export default {
{
{
this
.
isDeleteBttnVisible
=
false
;
this
.
isDeleteBttnVisible
=
false
;
let
lstCropIds
=
[];
let
lstCropIds
=
[];
//let lstPestIds = [];
let
cropCategoryIdProp
=
CommonUtil
.
CONST_CROP_CATEGORY_ID
;
let
cropCategoryIdProp
=
CommonUtil
.
CONST_CROP_CATEGORY_ID
;
let
jsonCrops
=
[];
let
jsonCrops
=
[];
let
arrCropCatIds
=
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_ID_LIST
).
split
(
"
,
"
);
let
arrCropCatIds
=
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_ID_LIST
).
split
(
"
,
"
);
let
jsonCropCategoryList
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_CATEGORY
));
let
jsonCropCategoryList
=
JSON
.
parse
(
localStorage
.
getItem
(
CommonUtil
.
CONST_STORAGE_CROP_CATEGORY
));
//let lstCropPestList = JSON.parse(localStorage.getItem(CommonUtil.CONST_STORAGE_CROP_PEST_LIST));
/* Iterate Selected Crop Ids */
/* Iterate Selected Crop Ids */
$
.
each
(
arrCropCatIds
,
function
(
index
,
cropCatId
){
$
.
each
(
arrCropCatIds
,
function
(
index
,
cropCatId
){
...
@@ -743,18 +764,9 @@ export default {
...
@@ -743,18 +764,9 @@ export default {
this
.
observationForStore
.
statusTypeId
=
CommonUtil
.
CONST_STATUS_PENDING
;
this
.
observationForStore
.
statusTypeId
=
CommonUtil
.
CONST_STATUS_PENDING
;
lstObservations
.
push
(
this
.
observationForStore
);
lstObservations
.
push
(
this
.
observationForStore
);
}
}
console
.
log
(
'
test-3-1
'
);
localStorage
.
setItem
(
CommonUtil
.
CONST_STORAGE_OBSERVATION_LIST
,
JSON
.
stringify
(
lstObservations
)
);
localStorage
.
setItem
(
CommonUtil
.
CONST_STORAGE_OBSERVATION_LIST
,
JSON
.
stringify
(
lstObservations
)
);
this
.
$router
.
replace
({
path
:
'
/
'
});
/* if(this.isSync===false)
{
this.isSync = true;
this.$refs.sync.syncObservationSendPrepareSingleObject(this.observationForStore,1);
this.isSync = false;
} */
this
.
$router
.
replace
({
path
:
'
/
'
});
//this.$router.push({path:'/'});
//this.$router.go();
},
},
updateQuntificationData
(
schemaData
){
updateQuntificationData
(
schemaData
){
...
@@ -806,7 +818,7 @@ export default {
...
@@ -806,7 +818,7 @@ export default {
var
dtToday
=
new
Date
();
var
dtToday
=
new
Date
();
var
month
=
dtToday
.
getMonth
()
+
1
;
var
month
=
dtToday
.
getMonth
()
+
1
;
var
day
=
dtToday
.
getDate
();
var
day
=
dtToday
.
getDate
();
...
@@ -832,7 +844,9 @@ export default {
...
@@ -832,7 +844,9 @@ export default {
this
.
strDateObservation
=
maxDate
+
'
T
'
+
hh
+
'
:
'
+
min
;
this
.
strDateObservation
=
maxDate
+
'
T
'
+
hh
+
'
:
'
+
min
;
/* Check existing Observation Object - Mainly from Map component
It helps to retain the data back to Observation from Map
*/
if
(
this
.
paramObservation
)
if
(
this
.
paramObservation
)
{
{
this
.
observation
=
this
.
paramObservation
;
this
.
observation
=
this
.
paramObservation
;
...
@@ -852,7 +866,7 @@ export default {
...
@@ -852,7 +866,7 @@ export default {
}
}
/* Get details of existing Observation */
if
(
this
.
observationId
)
if
(
this
.
observationId
)
{
{
this
.
getObservationFromStore
(
this
.
observationId
);
this
.
getObservationFromStore
(
this
.
observationId
);
...
...
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