From 5a7008068432baedeaa1116430d08d5d4a97b82a Mon Sep 17 00:00:00 2001
From: "jason.wall" <jason@walljm.com>
Date: Fri, 2 Dec 2016 13:00:55 -0500
Subject: [PATCH] FEATURE: added rmac and cross refs to strongs cards/modal

---
 .../strongs-modal/strongs-modal.html          | 17 ++++-
 .../components/strongs-modal/strongs-modal.ts | 29 ++++++--
 .../src/components/strongs/strongs.html       | 17 ++++-
 .../src/components/strongs/strongs.ts         | 13 +++-
 .../src/pages/search/search.html              |  2 +-
 .../src/pages/search/search.scss              |  4 ++
 DynamicBibleIonic/src/pages/search/search.ts  | 10 +--
 .../src/pages/settings/settings.ts            | 44 ++++++------
 DynamicBibleIonic/src/strongs-service.ts      | 69 +++++++++----------
 DynamicBibleIonic/src/types.ts                | 14 ++--
 10 files changed, 133 insertions(+), 86 deletions(-)

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 @@
     </ion-toolbar>
 </ion-header>
 <ion-content padding>
+    <br>
+    <h2>Strongs Definitition</h2>
     <p>
-        <b>{{item.def.tr}} ({{item.def.sn}})</b> - {{item.def.p}} - {{item.def.lemma}} - <span [innerHTML]="item.def.de"></span><br />
+        <b>{{item.def.tr}} ({{item.def.sn}})</b> - {{item.def.p}} - {{item.def.lemma}} - <span [innerHTML]="item.def.de"></span><br>
     </p>
+    <h2>Robinsons Morphalogical Analysis Code</h2>
+    <b>{{item.rmac.id}}</b><br>
+    <ul>
+        <li *ngFor="let c of item.rmac.d">
+            {{c}}
+        </li>
+    </ul>
+    <h2>Cross References</h2>
+    <dl>
+        <dd *ngFor="let wrd of item.crossrefs.ss">
+            {{wrd.w}}: <span *ngFor="let p of wrd.rs"><a (click)="openPassage(p.r)">{{makePassage(p.r)}}</a>, </span>
+        </dd>
+    </dl>
 </ion-content>
\ 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<string>();
+
+    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 @@
     </button>
 </ion-item>
 <ion-card-content>
+    <br>
+    <h2>Strongs Definitition</h2>
     <p>
-        <b>{{item.def.tr}} ({{item.def.sn}})</b> - {{item.def.p}} - {{item.def.lemma}} - <span [innerHTML]="item.def.de"></span><br />
+        <b>{{item.def.tr}} ({{item.def.sn}})</b> - {{item.def.p}} - {{item.def.lemma}} - <span [innerHTML]="item.def.de"></span><br>
     </p>
+    <h2>Robinsons Morphalogical Analysis Code</h2>
+    <b>{{item.rmac.id}}</b><br>
+    <ul>
+        <li *ngFor="let c of item.rmac.d">
+            {{c}}
+        </li>
+    </ul>
+    <h2>Cross References</h2>
+    <dl>
+        <dd *ngFor="let wrd of item.crossrefs.ss">
+            {{wrd.w}}: <span *ngFor="let p of wrd.rs"><a (click)="openPassage(p.r)">{{makePassage(p.r)}}</a>, </span>
+        </dd>
+    </dl>
 </ion-card-content>
\ 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<CardItem>();
 
+    @Output()
+    onPassageClicked = new EventEmitter<string>();
+
     @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 @@
 <ion-content padding class="search-card">
     <ion-card *ngFor="let item of items">
         <passage *ngIf="isPassage(item.type)" [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)" [dict]="item.dict" (onStrongsClicked)="getItems($event)"></passage>
-        <strongs *ngIf="isStrongs(item.type)" [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)"></strongs>
+        <strongs *ngIf="isStrongs(item.type)" [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)" (onPassageClicked)="getItems($event)"></strongs>
         <button ion-button icon-left clear small (click)="removeItem(item)">
             <ion-icon name="close-circle"></ion-icon>
             <div>Close</div>
diff --git a/DynamicBibleIonic/src/pages/search/search.scss b/DynamicBibleIonic/src/pages/search/search.scss
index 1ff937e3..b4c00f42 100644
--- a/DynamicBibleIonic/src/pages/search/search.scss
+++ b/DynamicBibleIonic/src/pages/search/search.scss
@@ -23,4 +23,8 @@ body {
 .scroll {
     -webkit-user-select: inherit;
   }
+}
+
+.card-md h2 {
+    font-size: 2rem;
 }
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/pages/search/search.ts b/DynamicBibleIonic/src/pages/search/search.ts
index b7fa8eea..03d1df26 100644
--- a/DynamicBibleIonic/src/pages/search/search.ts
+++ b/DynamicBibleIonic/src/pages/search/search.ts
@@ -51,7 +51,7 @@ export class SearchPage {
     }
 
     presentStrongsModal(strongs: StrongsResult) {
-        let modal = this.modalCtrl.create(StrongsModal, { strongsid: strongs });
+        let modal = this.modalCtrl.create(StrongsModal, { strongsid: strongs, onPassageClicked: this });
         modal.present();
     }
 
@@ -76,12 +76,6 @@ export class SearchPage {
 
     getItems(search) {
         try {
-            let loader = this.loadingCtrl.create({
-                content: "Retrieving passage...",
-                dismissOnPageChange: true
-            });
-            loader.present();
-
             let qs = search.split(";");
             for (let x in qs) {
                 if (qs.hasOwnProperty(x)) {
@@ -119,7 +113,7 @@ export class SearchPage {
                     }
                 }
             }
-            loader.dismiss();
+            //loader.dismiss();
 
             //Settings.SaveResults();
         }
diff --git a/DynamicBibleIonic/src/pages/settings/settings.ts b/DynamicBibleIonic/src/pages/settings/settings.ts
index d1f70da3..679d9284 100644
--- a/DynamicBibleIonic/src/pages/settings/settings.ts
+++ b/DynamicBibleIonic/src/pages/settings/settings.ts
@@ -1,16 +1,16 @@
 /// <reference path="../../types.ts" />
-import { Component } from '@angular/core';
-import { NavController } from 'ionic-angular';
-import { Storage } from '@ionic/storage';
-
-@Component({
-    selector: 'settings',
-    templateUrl: 'settings.html'
-})
-export class SettingsPage {
-    user: User = { strongs_modal: true };
-    constructor(public navCtrl: NavController, public local: Storage) {
-        
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
+import { Storage } from '@ionic/storage';
+
+@Component({
+    selector: 'settings',
+    templateUrl: 'settings.html'
+})
+export class SettingsPage {
+    user: User = { strongs_modal: true };
+    constructor(public navCtrl: NavController, public local: Storage) {
+        
         // Check if there is a profile saved in local storage
         this.local.get('profile').then(profile => {
             if (profile === null) {
@@ -20,14 +20,14 @@ export class SettingsPage {
                 this.user = JSON.parse(profile);
         }).catch(error => {
             console.log(error);
-        });
-    }
-
-    save() {
-        this.local.set('profile', JSON.stringify(this.user));
-    }
-
-    ionViewDidLoad() {
-        console.log('Hello SettingsPage Page');
-    }
+        });
+    }
+
+    save() {
+        this.local.set('profile', JSON.stringify(this.user));
+    }
+
+    ionViewDidLoad() {
+        console.log('Hello SettingsPage Page');
+    }
 }
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/strongs-service.ts b/DynamicBibleIonic/src/strongs-service.ts
index 48eb3ad2..7cea5bf1 100644
--- a/DynamicBibleIonic/src/strongs-service.ts
+++ b/DynamicBibleIonic/src/strongs-service.ts
@@ -4,35 +4,29 @@ import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 
 @Injectable()
-export class StrongsService
-{
+export class StrongsService {
     result: StrongsResult;
     count = 0;
 
-    constructor(private http: Http)
-    {
+    constructor(private http: Http) {
     }
-    getStrongs(sn: number, dict: string): StrongsResult
-    {
-        try
-        {
+    getStrongs(sn: number, dict: string): StrongsResult {
+        try {
             const self = this;
             this.result = {
                 prefix: "",
                 sn: -1,
                 strongs: [],
                 def: null,
-                rmac: [],
-                crossrefs: [],
+                rmac: null,
+                crossrefs: null,
                 rmaccode: ""
             };
             let url = dict + Math.ceil(sn / 100) + ".json";
-            if (dict === "grk")
-            {
+            if (dict === "grk") {
                 self.result.prefix = "G";
                 if (sn > 5624) return this.result;
-            } else
-            {
+            } else {
                 self.result.prefix = "H";
                 if (sn > 8674) return this.result;
             }
@@ -43,12 +37,10 @@ export class StrongsService
                 type: "GET",
                 url: `data/strongs/${url}`,
                 dataType: "json",
-                success: function (d: StrongsDefinition[], t, x)
-                {
+                success: function (d: StrongsDefinition[], t, x) {
                     self.result.strongs = d;
                 },
-                error: function (request, status, error)
-                {
+                error: function (request, status, error) {
                     //Util.HandleError(error);
                 }
             });
@@ -61,18 +53,20 @@ export class StrongsService
                 type: "GET",
                 url: `data/strongscr/cr${url}`,
                 dataType: "json",
-                success: function (d: StrongsCrossReference[], t, x)
-                {
-                    self.result.crossrefs = d;
+                success: function (d: StrongsCrossReference[], t, x) {
+                    for (let cr of d) {
+                        if (cr.id.toUpperCase() == self.result.prefix + self.result.sn) {
+                            self.result.crossrefs = cr;
+                            break;
+                        }
+                    }
                 },
-                error: function (request, status, error)
-                {
+                error: function (request, status, error) {
                     //Util.HandleError(error);
                 }
             });
 
-            if (dict === "grk")
-            {
+            if (dict === "grk") {
                 url = `data/rmac/rs${Math.ceil(sn / 1000)}.json`;
                 let rmac_cross_references: RMACCrossReference[];
 
@@ -82,40 +76,39 @@ export class StrongsService
                     type: "GET",
                     url: url,
                     dataType: "json",
-                    success: function (d: RMACCrossReference[], t, x)
-                    {
+                    success: function (d: RMACCrossReference[], t, x) {
                         rmac_cross_references = d;
                     },
-                    error: function (request, status, error)
-                    {
+                    error: function (request, status, error) {
                         //Util.HandleError(error);
                     }
                 });
 
                 // deal with RMAC
                 this.result.rmaccode = $.grep<RMACCrossReference>(rmac_cross_references, (el, i) => { if (el.i == sn + "") { return true; } else { return false; } })[0].r;
-                if (this.result.rmaccode != undefined)
-                {
+                if (this.result.rmaccode != undefined) {
                     url = `data/rmac/r-${this.result.rmaccode.substring(0, 1)}.json`;
                     $.ajax({
                         async: false,
                         type: "GET",
                         url: url,
                         dataType: "json",
-                        success: function (d: RMACDefinition[], t, x)
-                        {
-                            self.result.rmac = d;
+                        success: function (d: RMACDefinition[], t, x) {
+                            for (let rmac of d) {
+                                if (rmac.id.toLowerCase() == self.result.rmaccode) {
+                                    self.result.rmac = rmac;
+                                    break;
+                                }
+                            }
                         },
-                        error: function (request, status, error)
-                        {
+                        error: function (request, status, error) {
                             //Util.HandleError(error);
                         }
                     });
                 }
             }
             return this.result;
-        } catch (err)
-        {
+        } catch (err) {
             //Util.HandleError(err);
         }
         return null;
diff --git a/DynamicBibleIonic/src/types.ts b/DynamicBibleIonic/src/types.ts
index 8d1c68f7..e87e401c 100644
--- a/DynamicBibleIonic/src/types.ts
+++ b/DynamicBibleIonic/src/types.ts
@@ -1,8 +1,8 @@
-
-type CardItem = { id: number, data: any, type: any, dict: string}
-
-type User = {
-    strongs_modal: boolean
+
+type CardItem = { id: number, data: any, type: any, dict: string}
+
+type User = {
+    strongs_modal: boolean
 }
 
 type BiblePassage = {
@@ -49,8 +49,8 @@ type StrongsResult =
         sn: number,
         strongs: StrongsDefinition[],
         def: StrongsDefinition,
-        rmac: RMACDefinition[],
-        crossrefs: StrongsCrossReference[],
+        rmac: RMACDefinition,
+        crossrefs: StrongsCrossReference,
         rmaccode: string,
     };