diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html index 03467de9..d76ede07 100644 --- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html +++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html @@ -11,7 +11,22 @@ +
+

Strongs Definitition

- {{item.def.tr}} ({{item.def.sn}}) - {{item.def.p}} - {{item.def.lemma}} -
+ {{item.def.tr}} ({{item.def.sn}}) - {{item.def.p}} - {{item.def.lemma}} -

+

Robinsons Morphalogical Analysis Code

+ {{item.rmac.id}}
+ +

Cross References

+
+
+ {{wrd.w}}: {{makePassage(p.r)}}, +
+
\ No newline at end of file diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts index 7c4dad49..5dbcd432 100644 --- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts +++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.ts @@ -1,5 +1,6 @@ -import {Component} from "@angular/core"; +import { EventEmitter, Component, Input, Output } from "@angular/core"; import { Platform, NavParams, ViewController } from 'ionic-angular'; +import { Reference } from '../../Reference.ts'; @Component({ selector: "strongs-modal", @@ -8,15 +9,29 @@ import { Platform, NavParams, ViewController } from 'ionic-angular'; export class StrongsModal { item: StrongsResult; - constructor( - public platform: Platform, - public params: NavParams, - public viewCtrl: ViewController + @Output() + onPassageClicked = new EventEmitter(); + + constructor( + public platform: Platform, + public params: NavParams, + public viewCtrl: ViewController ) { this.item = this.params.get('strongsid') as StrongsResult; + this.onPassageClicked.subscribe(item => + this.params.get('onPassageClicked').getItems(item) + ) } - dismiss() { - this.viewCtrl.dismiss(); + dismiss() { + this.viewCtrl.dismiss(); + } + makePassage(p: string) { + return Reference.bookName(p.split(";")[0]) + ' ' + p.split(";")[1] + ":" + p.split(";")[2]; + } + openPassage(p: string) { + let ref = this.makePassage(p); + //this.dismiss(); + this.onPassageClicked.emit(ref); } } \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/strongs/strongs.html b/DynamicBibleIonic/src/components/strongs/strongs.html index b9d5e753..bcee7563 100644 --- a/DynamicBibleIonic/src/components/strongs/strongs.html +++ b/DynamicBibleIonic/src/components/strongs/strongs.html @@ -5,7 +5,22 @@ +
+

Strongs Definitition

- {{item.def.tr}} ({{item.def.sn}}) - {{item.def.p}} - {{item.def.lemma}} -
+ {{item.def.tr}} ({{item.def.sn}}) - {{item.def.p}} - {{item.def.lemma}} -

+

Robinsons Morphalogical Analysis Code

+ {{item.rmac.id}}
+ +

Cross References

+
+
+ {{wrd.w}}: {{makePassage(p.r)}}, +
+
\ No newline at end of file diff --git a/DynamicBibleIonic/src/components/strongs/strongs.ts b/DynamicBibleIonic/src/components/strongs/strongs.ts index 22f3d5cf..bd0665d3 100644 --- a/DynamicBibleIonic/src/components/strongs/strongs.ts +++ b/DynamicBibleIonic/src/components/strongs/strongs.ts @@ -1,4 +1,5 @@ -import {EventEmitter, Component, Input, Output} from "@angular/core"; +import { EventEmitter, Component, Input, Output } from "@angular/core"; +import { Reference } from '../../Reference.ts'; @Component({ selector: "strongs", @@ -8,6 +9,9 @@ export class Strongs { @Output() onClose = new EventEmitter(); + @Output() + onPassageClicked = new EventEmitter(); + @Input() item: StrongsResult; @@ -20,4 +24,11 @@ export class Strongs { close() { this.onClose.emit(this.cardItem); } + makePassage(p: string) { + return Reference.bookName(p.split(";")[0]) + ' ' + p.split(";")[1] + ":" + p.split(";")[2]; + } + openPassage(p: string) { + let ref = this.makePassage(p); + this.onPassageClicked.emit(ref); + } } \ No newline at end of file diff --git a/DynamicBibleIonic/src/pages/search/search.html b/DynamicBibleIonic/src/pages/search/search.html index 5a962d3d..79083948 100644 --- a/DynamicBibleIonic/src/pages/search/search.html +++ b/DynamicBibleIonic/src/pages/search/search.html @@ -9,7 +9,7 @@ - +