@@ -389,9 +389,6 @@ export default {
389
389
return jobProps
390
390
} ,
391
391
parseProps ( jobProps ) {
392
- if ( ! jobProps ) {
393
- return undefined
394
- }
395
392
let parsedProps = [ ]
396
393
for ( const j of jobProps ) {
397
394
let parsedJobProps = { id : j . id }
@@ -400,19 +397,21 @@ export default {
400
397
parsedJobProps [ prop ] = j [ prop ]
401
398
}
402
399
}
403
- let propSkills = [ ]
404
- for ( const s of j . skills ) {
405
- let skillIds = [ ]
406
- for ( const skill of this . skills ) {
407
- skillIds . push ( skill . id )
408
- }
409
- if ( skillIds . includes ( s ) ) {
410
- propSkills . push ( this . skills [ s - 1 ] )
411
- } else {
412
- propSkills . push ( new Skill ( 'Skill from added ' + this . $t ( 'optimization.job' ) + ' ' + j . id , s ) )
400
+ if ( j . skills ) {
401
+ let propSkills = [ ]
402
+ for ( const s of j . skills ) {
403
+ let skillIds = [ ]
404
+ for ( const skill of this . skills ) {
405
+ skillIds . push ( skill . id )
406
+ }
407
+ if ( skillIds . includes ( s ) ) {
408
+ propSkills . push ( this . skills [ s - 1 ] )
409
+ } else {
410
+ propSkills . push ( new Skill ( 'Skill from added ' + this . $t ( 'optimization.job' ) + ' ' + j . id , s ) )
411
+ }
413
412
}
413
+ parsedJobProps . skills = propSkills
414
414
}
415
- parsedJobProps . skills = propSkills
416
415
417
416
parsedProps . push ( parsedJobProps )
418
417
}
@@ -534,14 +533,19 @@ export default {
534
533
// places from the appRoute without changing the
535
534
// object reference because it is a prop
536
535
const defaultJobs = this . jobs
537
- const jobProps = this . parseProps ( this . $store . getters . appRouteData . options . jobProps )
538
536
const places = this . $store . getters . appRouteData . places
537
+ const propData = this . $store . getters . appRouteData . options . jobProps
539
538
let storedJobs = localStorage . getItem ( 'jobs' )
540
539
const jobs = [ ]
541
- if ( places . length > 0 ) {
540
+ if ( propData && places . length === propData . length ) {
541
+ const jobProps = this . parseProps ( propData )
542
542
for ( const [ i , place ] of places . entries ( ) ) {
543
543
jobs . push ( new Job ( place . lng , place . lat , place . placeName , jobProps [ i ] ) )
544
544
}
545
+ } else if ( places . length > 0 ) {
546
+ for ( const [ i , place ] of places . entries ( ) ) {
547
+ jobs . push ( new Job ( place . lng , place . lat , place . placeName , { id : i + 1 } ) )
548
+ }
545
549
} else if ( this . jobs === undefined && storedJobs ) {
546
550
for ( const job of JSON . parse ( storedJobs ) ) {
547
551
jobs . push ( Job . fromObject ( job ) )
0 commit comments