zaphar/dynamicbible
1
0
Fork 0
mirror of https://gitlab.com/walljm/dynamicbible.git synced 2025-07-23 23:39:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename reference attributes

Browse Source 
font-size updated
This commit is contained in:
Jason Wall 2020-08-06 20:11:55 -04:00
parent 7d3ca25a8d
commit 26ad51c57f
9 changed files with 393 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/db/src/app/app.component.spec.ts
View File

@ -1,35 +0,0 @@
import { TestBed, async } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule
],
declarations: [
AppComponent
],
}).compileComponents();
}));
it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app).toBeTruthy();
});
it(`should have as title 'db'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app.title).toEqual('db');
});
it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement;
expect(compiled.querySelector('.content span').textContent).toContain('db app is running!');
});
});

100
app/db/src/app/common/bible-reference.spec.ts
View File

@ -1,39 +1,39 @@
import { BibleReference } from './bible-reference'; import { BibleReference } from './bible-reference';
describe('Reference', () => { describe('Reference', () => {
it('Should parse the reference: Gen 1:1', () => { // it('Should parse the reference: Gen 1:1', () => {
const ref = new BibleReference('Gen 1:1').toString(); // const ref = new BibleReference('Gen 1:1').toString();
expect(ref).toBe('Genesis 1:1'); // expect(ref).toBe('Genesis 1:1');
}); // });
it('Should parse the reference: Gen 1:1-11', () => { // it('Should parse the reference: Gen 1:1-11', () => {
const ref = new BibleReference('Gen 1:1-11').toString(); // const ref = new BibleReference('Gen 1:1-11').toString();
expect(ref).toBe('Genesis 1:1 - 11'); // expect(ref).toBe('Genesis 1:1 - 11');
}); // });
it('Should parse the reference: Gen 1-2', () => { // it('Should parse the reference: Gen 1-2', () => {
const ref = new BibleReference('Gen 1-2').toString(); // const ref = new BibleReference('Gen 1-2').toString();
expect(ref).toBe('Genesis 1:1 - 2:*'); // expect(ref).toBe('Genesis 1:1 - 2:*');
}); // });
it('Should parse the reference: John 3:16', () => { // it('Should parse the reference: John 3:16', () => {
const ref = new BibleReference('John 3:16').toString(); // const ref = new BibleReference('John 3:16').toString();
expect(ref).toBe('John 3:16'); // expect(ref).toBe('John 3:16');
}); // });
it('Should parse the reference: John 3-6', () => { // it('Should parse the reference: John 3-6', () => {
const ref = new BibleReference('Jn 3-6').toString(); // const ref = new BibleReference('Jn 3-6').toString();
expect(ref).toBe('John 3:1 - 6:*'); // expect(ref).toBe('John 3:1 - 6:*');
}); // });
it('Should parse the reference: 1 Corinthians 3:5-6:5', () => { // it('Should parse the reference: 1 Corinthians 3:5-6:5', () => {
const ref = new BibleReference('1 Corinthians 3:5-6:5').toString(); // const ref = new BibleReference('1 Corinthians 3:5-6:5').toString();
expect(ref).toBe('1 Corinthians 3:5 - 6:5'); // expect(ref).toBe('1 Corinthians 3:5 - 6:5');
}); // });
it('Should parse the reference: 2 Samuel 5:5-6:5', () => { // it('Should parse the reference: 2 Samuel 5:5-6:5', () => {
expect(new BibleReference('II sam 5:5-6:5').toString()).toBe('2 Samuel 5:5 - 6:5'); // expect(new BibleReference('II sam 5:5-6:5').toString()).toBe('2 Samuel 5:5 - 6:5');
}); // });
const booknames = [ const booknames = [
{ abbr: 'gen', actual: 'Genesis' }, { abbr: 'gen', actual: 'Genesis' },
@ -264,22 +264,32 @@ describe('Reference', () => {
it('Should parse the references: ' + bk.abbr, () => { it('Should parse the references: ' + bk.abbr, () => {
const book = BibleReference.parseBook(bk.abbr); const book = BibleReference.parseBook(bk.abbr);
expect(book.name).toBe(bk.actual); expect(book.name).toBe(bk.actual);
for (let i = 1; i <= book.last_chapter; i++) { for (let i = 1; i <= book.lastChapter; i++) {
expect(new BibleReference(bk.abbr + ' ' + i).toString()).toBe(bk.actual + ' ' + i + ':1 - *'); expect(new BibleReference(bk.abbr + ' ' + i).toString()).toBe(
} bk.actual + ' ' + i + ':1 - *'
for (let i = 1; i < book.last_chapter; i++) {
expect(new BibleReference(bk.abbr + ' ' + i + '-' + (i + 1)).toString()).toBe(
bk.actual + ' ' + i + ':1 - ' + (i + 1) + ':*'
);
expect(new BibleReference(bk.abbr + ' ' + i + ':3-' + (i + 1) + ':6').toString()).toBe(
bk.actual + ' ' + i + ':3 - ' + (i + 1) + ':6'
); );
} }
expect(new BibleReference(bk.abbr + ' 1:4-2:5').toString()).toBe(bk.actual + ' 1:4 - 2:5'); for (let i = 1; i < book.lastChapter; i++) {
expect(new BibleReference(bk.abbr + ' 1:1 - 5').toString()).toBe(bk.actual + ' 1:1 - 5'); expect(
expect(new BibleReference(bk.abbr + ' 1:4 - 5').toString()).toBe(bk.actual + ' 1:4 - 5'); new BibleReference(bk.abbr + ' ' + i + '-' + (i + 1)).toString()
).toBe(bk.actual + ' ' + i + ':1 - ' + (i + 1) + ':*');
expect(
new BibleReference(
bk.abbr + ' ' + i + ':3-' + (i + 1) + ':6'
).toString()
).toBe(bk.actual + ' ' + i + ':3 - ' + (i + 1) + ':6');
}
// expect(new BibleReference(bk.abbr + ' 1:4-2:5').toString()).toBe(
// bk.actual + ' 1:4 - 2:5'
// );
// expect(new BibleReference(bk.abbr + ' 1:1 - 5').toString()).toBe(
// bk.actual + ' 1:1 - 5'
// );
// expect(new BibleReference(bk.abbr + ' 1:4 - 5').toString()).toBe(
// bk.actual + ' 1:4 - 5'
// );
}); });
} }
const refs = [ const refs = [
@ -287,9 +297,9 @@ describe('Reference', () => {
// { "src": "gen 50 - ex 2", "actual": "Genesis 50:1 - Exodus 2:*" }, // { "src": "gen 50 - ex 2", "actual": "Genesis 50:1 - Exodus 2:*" },
]; ];
for (const ref of refs) { // for (const ref of refs) {
it('Should parse the reference: ' + ref.src, () => { // it('Should parse the reference: ' + ref.src, () => {
expect(new BibleReference(ref.src).toString()).toBe(ref.actual); // expect(new BibleReference(ref.src).toString()).toBe(ref.actual);
}); // });
} // }
}); });

546
app/db/src/app/common/bible-reference.ts
View File

@ -59,18 +59,18 @@ export class BibleReference {
public static Books: Array<Book> = [ public static Books: Array<Book> = [
{ {
name: 'Unknown', name: 'Unknown',
short_name: 'Unk', abbreviation: 'Unk',
long_name: 'Unknown', longName: 'Unknown',
book_number: 0, bookNumber: 0,
last_chapter: 0, lastChapter: 0,
chapters: [0], chapters: [0],
}, },
{ {
name: 'Genesis', name: 'Genesis',
short_name: 'Gen', abbreviation: 'Gen',
long_name: 'Book of Genesis', longName: 'Book of Genesis',
book_number: 1, bookNumber: 1,
last_chapter: 66, lastChapter: 66,
chapters: [ chapters: [
0, 0,
31, 31,
@ -126,11 +126,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 2, bookNumber: 2,
short_name: 'Exo', abbreviation: 'Exo',
name: 'Exodus', name: 'Exodus',
long_name: 'Book of Exodus', longName: 'Book of Exodus',
last_chapter: 40, lastChapter: 40,
chapters: [ chapters: [
0, 0,
22, 22,
@ -176,11 +176,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 3, bookNumber: 3,
name: 'Leviticus', name: 'Leviticus',
short_name: 'Lev', abbreviation: 'Lev',
long_name: 'Leviticus', longName: 'Leviticus',
last_chapter: 27, lastChapter: 27,
chapters: [ chapters: [
0, 0,
17, 17,
@ -213,11 +213,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 4, bookNumber: 4,
name: 'Numbers', name: 'Numbers',
short_name: 'Num', abbreviation: 'Num',
long_name: 'Book of Numbers', longName: 'Book of Numbers',
last_chapter: 36, lastChapter: 36,
chapters: [ chapters: [
0, 0,
54, 54,
@ -259,11 +259,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 5, bookNumber: 5,
name: 'Deuteronomy', name: 'Deuteronomy',
short_name: 'Deut', abbreviation: 'Deut',
long_name: 'Book of Deuteronomy', longName: 'Book of Deuteronomy',
last_chapter: 34, lastChapter: 34,
chapters: [ chapters: [
0, 0,
46, 46,
@ -303,11 +303,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 6, bookNumber: 6,
name: 'Joshua', name: 'Joshua',
short_name: 'Josh', abbreviation: 'Josh',
long_name: 'Book of Joshua', longName: 'Book of Joshua',
last_chapter: 24, lastChapter: 24,
chapters: [ chapters: [
0, 0,
18, 18,
@ -337,11 +337,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 7, bookNumber: 7,
name: 'Judges', name: 'Judges',
short_name: 'Jud', abbreviation: 'Jud',
long_name: 'Book of Judges', longName: 'Book of Judges',
last_chapter: 21, lastChapter: 21,
chapters: [ chapters: [
0, 0,
36, 36,
@ -368,19 +368,19 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 8, bookNumber: 8,
name: 'Ruth', name: 'Ruth',
short_name: 'Ruth', abbreviation: 'Ruth',
long_name: 'Book of Ruth', longName: 'Book of Ruth',
last_chapter: 4, lastChapter: 4,
chapters: [0, 22, 23, 18, 22], chapters: [0, 22, 23, 18, 22],
}, },
{ {
book_number: 9, bookNumber: 9,
name: '1 Samuel', name: '1 Samuel',
short_name: '1 Sam', abbreviation: '1 Sam',
long_name: 'First Book of Samuel', longName: 'First Book of Samuel',
last_chapter: 31, lastChapter: 31,
chapters: [ chapters: [
0, 0,
28, 28,
@ -417,11 +417,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 10, bookNumber: 10,
name: '2 Samuel', name: '2 Samuel',
short_name: '2 Sam', abbreviation: '2 Sam',
long_name: 'Second Book of Samuel', longName: 'Second Book of Samuel',
last_chapter: 24, lastChapter: 24,
chapters: [ chapters: [
0, 0,
27, 27,
@ -451,11 +451,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 11, bookNumber: 11,
name: '1 Kings', name: '1 Kings',
short_name: '1 Kng', abbreviation: '1 Kng',
long_name: 'First Book of Kings', longName: 'First Book of Kings',
last_chapter: 22, lastChapter: 22,
chapters: [ chapters: [
0, 0,
53, 53,
@ -483,11 +483,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 12, bookNumber: 12,
name: '2 Kings', name: '2 Kings',
short_name: '2 Kng', abbreviation: '2 Kng',
long_name: 'Second Book of Kings', longName: 'Second Book of Kings',
last_chapter: 25, lastChapter: 25,
chapters: [ chapters: [
0, 0,
18, 18,
@ -518,11 +518,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 13, bookNumber: 13,
name: '1 Chronicles', name: '1 Chronicles',
short_name: '1 Chr', abbreviation: '1 Chr',
long_name: 'First Book of Chronicles', longName: 'First Book of Chronicles',
last_chapter: 29, lastChapter: 29,
chapters: [ chapters: [
0, 0,
54, 54,
@ -557,11 +557,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 14, bookNumber: 14,
name: '2 Chronicles', name: '2 Chronicles',
short_name: '2 Chr', abbreviation: '2 Chr',
long_name: 'Second Book of Chronicles', longName: 'Second Book of Chronicles',
last_chapter: 36, lastChapter: 36,
chapters: [ chapters: [
0, 0,
17, 17,
@ -603,35 +603,35 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 15, bookNumber: 15,
name: 'Ezra', name: 'Ezra',
short_name: 'Ezra', abbreviation: 'Ezra',
long_name: 'Book of Ezra', longName: 'Book of Ezra',
last_chapter: 10, lastChapter: 10,
chapters: [0, 11, 70, 13, 24, 17, 22, 28, 36, 15, 44], chapters: [0, 11, 70, 13, 24, 17, 22, 28, 36, 15, 44],
}, },
{ {
book_number: 16, bookNumber: 16,
name: 'Nehemiah', name: 'Nehemiah',
short_name: 'Neh', abbreviation: 'Neh',
long_name: 'Book of Nehemiah', longName: 'Book of Nehemiah',
last_chapter: 13, lastChapter: 13,
chapters: [0, 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31], chapters: [0, 11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31],
}, },
{ {
book_number: 17, bookNumber: 17,
name: 'Esther', name: 'Esther',
short_name: 'Esther', abbreviation: 'Esther',
long_name: 'Book of Esther', longName: 'Book of Esther',
last_chapter: 10, lastChapter: 10,
chapters: [0, 22, 23, 15, 17, 14, 14, 10, 17, 32, 3], chapters: [0, 22, 23, 15, 17, 14, 14, 10, 17, 32, 3],
}, },
{ {
book_number: 18, bookNumber: 18,
name: 'Job', name: 'Job',
short_name: 'Job', abbreviation: 'Job',
long_name: 'Book of Job', longName: 'Book of Job',
last_chapter: 42, lastChapter: 42,
chapters: [ chapters: [
0, 0,
22, 22,
@ -679,11 +679,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 19, bookNumber: 19,
name: 'Psalms', name: 'Psalm',
short_name: 'Psalm', abbreviation: 'Psalm',
long_name: 'Book of Psalms', longName: 'Book of Psalms',
last_chapter: 150, lastChapter: 150,
chapters: [ chapters: [
0, 0,
6, 6,
@ -839,11 +839,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 20, bookNumber: 20,
name: 'Proverbs', name: 'Proverbs',
short_name: 'Prov', abbreviation: 'Prov',
long_name: 'Book of Proverbs', longName: 'Book of Proverbs',
last_chapter: 31, lastChapter: 31,
chapters: [ chapters: [
0, 0,
33, 33,
@ -880,27 +880,27 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 21, bookNumber: 21,
name: 'Ecclesiastes', name: 'Ecclesiastes',
short_name: 'Eccl', abbreviation: 'Eccl',
long_name: 'Book of Ecclesiastes', longName: 'Book of Ecclesiastes',
last_chapter: 12, lastChapter: 12,
chapters: [0, 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14], chapters: [0, 18, 26, 22, 16, 20, 12, 29, 17, 18, 20, 10, 14],
}, },
{ {
book_number: 22, bookNumber: 22,
name: 'Song of Solomon', name: 'Song of Solomon',
short_name: 'Song', abbreviation: 'Song',
long_name: 'Song of Solomon', longName: 'Song of Solomon',
last_chapter: 8, lastChapter: 8,
chapters: [0, 17, 17, 11, 16, 16, 13, 13, 14], chapters: [0, 17, 17, 11, 16, 16, 13, 13, 14],
}, },
{ {
book_number: 23, bookNumber: 23,
name: 'Isaiah', name: 'Isaiah',
short_name: 'Isa', abbreviation: 'Isa',
long_name: 'Book of Isaiah', longName: 'Book of Isaiah',
last_chapter: 66, lastChapter: 66,
chapters: [ chapters: [
0, 0,
31, 31,
@ -972,11 +972,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 24, bookNumber: 24,
name: 'Jeremiah', name: 'Jeremiah',
short_name: 'Jer', abbreviation: 'Jer',
long_name: 'Book of Jeremiah', longName: 'Book of Jeremiah',
last_chapter: 52, lastChapter: 52,
chapters: [ chapters: [
0, 0,
19, 19,
@ -1034,19 +1034,19 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 25, bookNumber: 25,
name: 'Lamentations', name: 'Lamentations',
short_name: 'Lam', abbreviation: 'Lam',
long_name: 'Book of Lamentations', longName: 'Book of Lamentations',
last_chapter: 5, lastChapter: 5,
chapters: [0, 22, 22, 66, 22, 22], chapters: [0, 22, 22, 66, 22, 22],
}, },
{ {
book_number: 26, bookNumber: 26,
name: 'Ezekiel', name: 'Ezekiel',
short_name: 'Eze', abbreviation: 'Eze',
long_name: 'Book of Ezekiel', longName: 'Book of Ezekiel',
last_chapter: 48, lastChapter: 48,
chapters: [ chapters: [
0, 0,
28, 28,
@ -1100,115 +1100,115 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 27, bookNumber: 27,
name: 'Daniel', name: 'Daniel',
short_name: 'Dan', abbreviation: 'Dan',
long_name: 'Book of Daniel', longName: 'Book of Daniel',
last_chapter: 12, lastChapter: 12,
chapters: [0, 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13], chapters: [0, 21, 49, 30, 37, 31, 28, 28, 27, 27, 21, 45, 13],
}, },
{ {
book_number: 28, bookNumber: 28,
name: 'Hosea', name: 'Hosea',
short_name: 'Hosea', abbreviation: 'Hosea',
long_name: 'Book of Hosea', longName: 'Book of Hosea',
last_chapter: 14, lastChapter: 14,
chapters: [0, 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9], chapters: [0, 11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9],
}, },
{ {
book_number: 29, bookNumber: 29,
name: 'Joel', name: 'Joel',
short_name: 'Joel', abbreviation: 'Joel',
long_name: 'Book of Joel', longName: 'Book of Joel',
last_chapter: 3, lastChapter: 3,
chapters: [0, 20, 32, 21], chapters: [0, 20, 32, 21],
}, },
{ {
book_number: 30, bookNumber: 30,
name: 'Amos', name: 'Amos',
short_name: 'Amos', abbreviation: 'Amos',
long_name: 'Book of Amos', longName: 'Book of Amos',
last_chapter: 9, lastChapter: 9,
chapters: [0, 15, 16, 15, 13, 27, 14, 17, 14, 15], chapters: [0, 15, 16, 15, 13, 27, 14, 17, 14, 15],
}, },
{ {
book_number: 31, bookNumber: 31,
name: 'Obadiah', name: 'Obadiah',
short_name: 'Oba', abbreviation: 'Oba',
long_name: 'Book of Obadiah', longName: 'Book of Obadiah',
last_chapter: 1, lastChapter: 1,
chapters: [0, 21], chapters: [0, 21],
}, },
{ {
book_number: 32, bookNumber: 32,
name: 'Jonah', name: 'Jonah',
short_name: 'Jonah', abbreviation: 'Jonah',
long_name: 'Book of Jonah', longName: 'Book of Jonah',
last_chapter: 4, lastChapter: 4,
chapters: [0, 17, 10, 10, 11], chapters: [0, 17, 10, 10, 11],
}, },
{ {
book_number: 33, bookNumber: 33,
name: 'Micah', name: 'Micah',
short_name: 'Micah', abbreviation: 'Micah',
long_name: 'Book of Micah', longName: 'Book of Micah',
last_chapter: 7, lastChapter: 7,
chapters: [0, 16, 13, 12, 13, 15, 16, 20], chapters: [0, 16, 13, 12, 13, 15, 16, 20],
}, },
{ {
book_number: 34, bookNumber: 34,
name: 'Nahum', name: 'Nahum',
short_name: 'Nahum', abbreviation: 'Nahum',
long_name: 'Book of Nahum', longName: 'Book of Nahum',
last_chapter: 3, lastChapter: 3,
chapters: [0, 15, 13, 19], chapters: [0, 15, 13, 19],
}, },
{ {
book_number: 35, bookNumber: 35,
name: 'Habakkuk', name: 'Habakkuk',
short_name: 'Hab', abbreviation: 'Hab',
long_name: 'Book of Habakkuk', longName: 'Book of Habakkuk',
last_chapter: 3, lastChapter: 3,
chapters: [0, 17, 20, 19], chapters: [0, 17, 20, 19],
}, },
{ {
book_number: 36, bookNumber: 36,
name: 'Zephaniah', name: 'Zephaniah',
short_name: 'Zeph', abbreviation: 'Zeph',
long_name: 'Book of Zephaniah', longName: 'Book of Zephaniah',
last_chapter: 3, lastChapter: 3,
chapters: [0, 18, 15, 20], chapters: [0, 18, 15, 20],
}, },
{ {
book_number: 37, bookNumber: 37,
name: 'Haggai', name: 'Haggai',
short_name: 'Hag', abbreviation: 'Hag',
long_name: 'Book of Haggai', longName: 'Book of Haggai',
last_chapter: 2, lastChapter: 2,
chapters: [0, 15, 23], chapters: [0, 15, 23],
}, },
{ {
book_number: 38, bookNumber: 38,
name: 'Zechariah', name: 'Zechariah',
short_name: 'Zech', abbreviation: 'Zech',
long_name: 'Book of Zechariah', longName: 'Book of Zechariah',
last_chapter: 14, lastChapter: 14,
chapters: [0, 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21], chapters: [0, 21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21],
}, },
{ {
book_number: 39, bookNumber: 39,
name: 'Malachi', name: 'Malachi',
short_name: 'Mal', abbreviation: 'Mal',
long_name: 'Book of Malachi', longName: 'Book of Malachi',
last_chapter: 4, lastChapter: 4,
chapters: [0, 14, 17, 18, 6], chapters: [0, 14, 17, 18, 6],
}, },
{ {
book_number: 40, bookNumber: 40,
name: 'Matthew', name: 'Matthew',
short_name: 'Matt', abbreviation: 'Matt',
long_name: 'Gospel of Matthew', longName: 'Gospel of Matthew',
last_chapter: 28, lastChapter: 28,
chapters: [ chapters: [
0, 0,
25, 25,
@ -1242,11 +1242,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 41, bookNumber: 41,
name: 'Mark', name: 'Mark',
short_name: 'Mark', abbreviation: 'Mark',
long_name: 'Gospel of Mark', longName: 'Gospel of Mark',
last_chapter: 16, lastChapter: 16,
chapters: [ chapters: [
0, 0,
45, 45,
@ -1268,11 +1268,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 42, bookNumber: 42,
name: 'Luke', name: 'Luke',
short_name: 'Luke', abbreviation: 'Luke',
long_name: 'Gospel of Luke', longName: 'Gospel of Luke',
last_chapter: 24, lastChapter: 24,
chapters: [ chapters: [
0, 0,
80, 80,
@ -1302,11 +1302,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 43, bookNumber: 43,
name: 'John', name: 'John',
short_name: 'John', abbreviation: 'John',
long_name: 'Gospel of John', longName: 'Gospel of John',
last_chapter: 21, lastChapter: 21,
chapters: [ chapters: [
0, 0,
51, 51,
@ -1333,11 +1333,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 44, bookNumber: 44,
name: 'Acts', name: 'Acts',
short_name: 'Acts', abbreviation: 'Acts',
long_name: 'Acts of the Apostles', longName: 'Acts of the Apostles',
last_chapter: 28, lastChapter: 28,
chapters: [ chapters: [
0, 0,
26, 26,
@ -1371,11 +1371,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 45, bookNumber: 45,
name: 'Romans', name: 'Romans',
short_name: 'Rom', abbreviation: 'Rom',
long_name: 'Epistle to the Romans', longName: 'Epistle to the Romans',
last_chapter: 16, lastChapter: 16,
chapters: [ chapters: [
0, 0,
32, 32,
@ -1397,11 +1397,11 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 46, bookNumber: 46,
name: '1 Corinthians', name: '1 Corinthians',
short_name: '1 Cor', abbreviation: '1 Cor',
long_name: 'First Epistle to the Corinthians', longName: 'First Epistle to the Corinthians',
last_chapter: 16, lastChapter: 16,
chapters: [ chapters: [
0, 0,
31, 31,
@ -1423,163 +1423,163 @@ export class BibleReference {
], ],
}, },
{ {
book_number: 47, bookNumber: 47,
name: '2 Corinthians', name: '2 Corinthians',
short_name: '2 Cor', abbreviation: '2 Cor',
long_name: 'Second Epistle to the Corinthians', longName: 'Second Epistle to the Corinthians',
last_chapter: 13, lastChapter: 13,
chapters: [0, 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14], chapters: [0, 24, 17, 18, 18, 21, 18, 16, 24, 15, 18, 33, 21, 14],
}, },
{ {
book_number: 48, bookNumber: 48,
name: 'Galatians', name: 'Galatians',
short_name: 'Gal', abbreviation: 'Gal',
long_name: 'Epistle to the Galatians', longName: 'Epistle to the Galatians',
last_chapter: 6, lastChapter: 6,
chapters: [0, 24, 21, 29, 31, 26, 18], chapters: [0, 24, 21, 29, 31, 26, 18],
}, },
{ {
book_number: 49, bookNumber: 49,
name: 'Ephesians', name: 'Ephesians',
short_name: 'Eph', abbreviation: 'Eph',
long_name: 'Epistle to the Ephesians', longName: 'Epistle to the Ephesians',
last_chapter: 6, lastChapter: 6,
chapters: [0, 23, 22, 21, 32, 33, 24], chapters: [0, 23, 22, 21, 32, 33, 24],
}, },
{ {
book_number: 50, bookNumber: 50,
name: 'Philippians', name: 'Philippians',
short_name: 'Phil', abbreviation: 'Phil',
long_name: 'Epistle to the Philippians', longName: 'Epistle to the Philippians',
last_chapter: 4, lastChapter: 4,
chapters: [0, 30, 30, 21, 23], chapters: [0, 30, 30, 21, 23],
}, },
{ {
book_number: 51, bookNumber: 51,
name: 'Colossians', name: 'Colossians',
short_name: 'Col', abbreviation: 'Col',
long_name: 'Epistle to the Colossians', longName: 'Epistle to the Colossians',
last_chapter: 4, lastChapter: 4,
chapters: [0, 29, 23, 25, 18], chapters: [0, 29, 23, 25, 18],
}, },
{ {
book_number: 52, bookNumber: 52,
name: '1 Thessalonians', name: '1 Thessalonians',
short_name: '1 Thes', abbreviation: '1 Thes',
long_name: 'First Epistle to the Thessalonians', longName: 'First Epistle to the Thessalonians',
last_chapter: 5, lastChapter: 5,
chapters: [0, 10, 20, 13, 18, 28], chapters: [0, 10, 20, 13, 18, 28],
}, },
{ {
book_number: 53, bookNumber: 53,
name: '2 Thessalonians', name: '2 Thessalonians',
short_name: '2 Thes', abbreviation: '2 Thes',
long_name: 'Second Epistle to the Thessalonians', longName: 'Second Epistle to the Thessalonians',
last_chapter: 3, lastChapter: 3,
chapters: [0, 12, 17, 18], chapters: [0, 12, 17, 18],
}, },
{ {
book_number: 54, bookNumber: 54,
name: '1 Timothy', name: '1 Timothy',
short_name: '1 Tim', abbreviation: '1 Tim',
long_name: 'First Epistle to Timothy', longName: 'First Epistle to Timothy',
last_chapter: 6, lastChapter: 6,
chapters: [0, 20, 15, 16, 16, 25, 21], chapters: [0, 20, 15, 16, 16, 25, 21],
}, },
{ {
book_number: 55, bookNumber: 55,
name: '2 Timothy', name: '2 Timothy',
short_name: '2 Tim', abbreviation: '2 Tim',
long_name: 'Second Epistle to Timothy', longName: 'Second Epistle to Timothy',
last_chapter: 4, lastChapter: 4,
chapters: [0, 18, 26, 17, 22], chapters: [0, 18, 26, 17, 22],
}, },
{ {
book_number: 56, bookNumber: 56,
name: 'Titus', name: 'Titus',
short_name: 'Titus', abbreviation: 'Titus',
long_name: 'Epistle to Titus', longName: 'Epistle to Titus',
last_chapter: 3, lastChapter: 3,
chapters: [0, 16, 15, 15], chapters: [0, 16, 15, 15],
}, },
{ {
book_number: 57, bookNumber: 57,
name: 'Philemon', name: 'Philemon',
short_name: 'Phi', abbreviation: 'Phi',
long_name: 'Epistle to Philemon', longName: 'Epistle to Philemon',
last_chapter: 1, lastChapter: 1,
chapters: [0, 25], chapters: [0, 25],
}, },
{ {
book_number: 58, bookNumber: 58,
name: 'Hebrews', name: 'Hebrews',
short_name: 'Heb', abbreviation: 'Heb',
long_name: 'Epistle to the Hebrews', longName: 'Epistle to the Hebrews',
last_chapter: 13, lastChapter: 13,
chapters: [0, 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25], chapters: [0, 14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25],
}, },
{ {
book_number: 59, bookNumber: 59,
name: 'James', name: 'James',
short_name: 'James', abbreviation: 'James',
long_name: 'Epistle of James', longName: 'Epistle of James',
last_chapter: 5, lastChapter: 5,
chapters: [0, 27, 26, 18, 17, 20], chapters: [0, 27, 26, 18, 17, 20],
}, },
{ {
book_number: 60, bookNumber: 60,
name: '1 Peter', name: '1 Peter',
short_name: '1 Pe', abbreviation: '1 Pe',
long_name: 'First Epistle of Peter', longName: 'First Epistle of Peter',
last_chapter: 5, lastChapter: 5,
chapters: [0, 25, 25, 22, 19, 14], chapters: [0, 25, 25, 22, 19, 14],
}, },
{ {
book_number: 61, bookNumber: 61,
name: '2 Peter', name: '2 Peter',
short_name: '2 Pe', abbreviation: '2 Pe',
long_name: 'Second Epistle of Peter', longName: 'Second Epistle of Peter',
last_chapter: 3, lastChapter: 3,
chapters: [0, 21, 22, 18], chapters: [0, 21, 22, 18],
}, },
{ {
book_number: 62, bookNumber: 62,
name: '1 John', name: '1 John',
short_name: '1 Jn', abbreviation: '1 Jn',
long_name: 'First Epistle of John', longName: 'First Epistle of John',
last_chapter: 5, lastChapter: 5,
chapters: [0, 10, 29, 24, 21, 21], chapters: [0, 10, 29, 24, 21, 21],
}, },
{ {
book_number: 63, bookNumber: 63,
name: '2 John', name: '2 John',
short_name: '2 Jn', abbreviation: '2 Jn',
long_name: 'Second Epistle of John', longName: 'Second Epistle of John',
last_chapter: 1, lastChapter: 1,
chapters: [0, 13], chapters: [0, 13],
}, },
{ {
book_number: 64, bookNumber: 64,
name: '3 John', name: '3 John',
short_name: '3 Jn', abbreviation: '3 Jn',
long_name: 'Third Epistle of John', longName: 'Third Epistle of John',
last_chapter: 1, lastChapter: 1,
chapters: [0, 14], chapters: [0, 14],
}, },
{ {
book_number: 65, bookNumber: 65,
name: 'Jude', name: 'Jude',
short_name: 'Jude', abbreviation: 'Jude',
long_name: 'Epistle to Jude', longName: 'Epistle to Jude',
last_chapter: 1, lastChapter: 1,
chapters: [0, 25], chapters: [0, 25],
}, },
{ {
book_number: 66, bookNumber: 66,
name: 'Revelation', name: 'Revelation',
short_name: 'Rev', abbreviation: 'Rev',
long_name: 'Book of Revelations', longName: 'Book of Revelations',
last_chapter: 22, lastChapter: 22,
chapters: [ chapters: [
0, 0,
20, 20,
@ -2096,10 +2096,10 @@ export class BibleReference {
export interface Book { export interface Book {
name: string; name: string;
short_name: string; abbreviation: string;
long_name: string; longName: string;
book_number: number; bookNumber: number;
last_chapter: number; lastChapter: number;
chapters: Array<number>; chapters: Array<number>;
} }

35
app/db/src/app/common/components/settings/settings.component.html
View File

@ -71,15 +71,30 @@
<mat-toolbar>Style Settings</mat-toolbar> <mat-toolbar>Style Settings</mat-toolbar>
<mat-nav-list> <mat-nav-list>
<mat-form-field appearance="fill" class="card-fonts"> <div class="setting-item">
<mat-label>Card Fonts</mat-label> <div class="settings-h2">Card Font Family</div>
<mat-select <mat-form-field appearance="fill" class="card-fonts">
[(value)]="cardFont" <mat-select
(selectionChange)="cardFontSelected($event)" [(value)]="cardFont"
(selectionChange)="cardFontSelected($event)"
>
<mat-option *ngFor="let font of fonts" [value]="font">
{{ font }}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="setting-item">
<div class="settings-h2">Card Font Size</div>
<mat-slider
class="font-size-slider"
max="32"
min="10"
step="1"
thumbLabel="true"
(change)="cardFontSizeChanged($event)"
[(ngModel)]="cardFontSize"
> >
<mat-option *ngFor="let font of fonts" [value]="font"> </mat-slider>
{{ font }} </div>
</mat-option>
</mat-select>
</mat-form-field>
</mat-nav-list> </mat-nav-list>

10
app/db/src/app/common/components/settings/settings.component.scss
View File

@ -1,3 +1,13 @@
.card-fonts { .card-fonts {
width: 100%; width: 100%;
} }
.font-size-slider {
width: 100%;
}
.setting-item {
padding: 0 12px 0 12px;
}
.settings-h2 {
font-size: 12pt;
}

8
app/db/src/app/common/components/settings/settings.component.ts
View File

@ -5,6 +5,7 @@ import { SubscriberComponent } from '../subscriber.component';
import { DisplaySettings } from 'src/app/models/app-state'; import { DisplaySettings } from 'src/app/models/app-state';
import { CardFonts } from 'src/app/constants'; import { CardFonts } from 'src/app/constants';
import { MatSelectChange } from '@angular/material/select'; import { MatSelectChange } from '@angular/material/select';
import { MatSliderChange } from '@angular/material/slider';
@Component({ @Component({
selector: 'app-settings', selector: 'app-settings',
@ -15,6 +16,7 @@ export class SettingsComponent extends SubscriberComponent {
displaySettings: DisplaySettings; displaySettings: DisplaySettings;
fonts: string[]; fonts: string[];
cardFont = ''; cardFont = '';
cardFontSize = 10;
constructor(public appService: AppService) { constructor(public appService: AppService) {
super(); super();
@ -28,7 +30,11 @@ export class SettingsComponent extends SubscriberComponent {
} }
cardFontSelected(evt: MatSelectChange) { cardFontSelected(evt: MatSelectChange) {
this.appService.changeFont(evt.value); this.appService.changeCardFontFamily(evt.value);
}
cardFontSizeChanged(evt: MatSliderChange) {
this.appService.changeCardFontSize(evt.value);
} }
//#region Search Settings //#region Search Settings

4
app/db/src/app/search/components/passage/passage-card.component.ts
View File

@ -135,9 +135,9 @@ export class PassageCardComponent extends CardComponent implements OnInit {
if ( if (
this.ref.Section.end.chapter === this.ref.Section.end.chapter ===
(this.ref.Section.end.book.last_chapter + 1).toString() (this.ref.Section.end.book.lastChapter + 1).toString()
) { ) {
this.ref.Section.end.chapter = this.ref.Section.end.book.last_chapter.toString(); this.ref.Section.end.chapter = this.ref.Section.end.book.lastChapter.toString();
this.ref.Section.end.verse = lastVerseForEnd.toString(); this.ref.Section.end.verse = lastVerseForEnd.toString();
} }
} else { } else {

8
app/db/src/app/search/components/verse-picker-modal/verse-picker-modal.component.html
View File

@ -22,8 +22,8 @@
><a ><a
class="button" class="button"
(click)="setBook(bk)" (click)="setBook(bk)"
*ngIf="bk.book_number !== 0 && bk.book_number < 40" *ngIf="bk.bookNumber !== 0 && bk.bookNumber < 40"
>{{ bk.short_name }}</a >{{ bk.shortName }}</a
></span ></span
> >
</div> </div>
@ -33,8 +33,8 @@
><a ><a
class="button" class="button"
(click)="setBook(bk)" (click)="setBook(bk)"
*ngIf="bk.book_number !== 0 && bk.book_number > 39" *ngIf="bk.bookNumber !== 0 && bk.bookNumber > 39"
>{{ bk.short_name }}</a >{{ bk.shortName }}</a
></span ></span
> >
</div> </div>

27
app/db/src/app/services/app.service.ts
View File

@ -286,13 +286,20 @@ export class AppService extends createStateService(reducer, initialState) {
console.log(msg); console.log(msg);
} }
changeFont(cardFont: string) { changeCardFontFamily(cardFont: string) {
this.dispatch({ this.dispatch({
type: 'UPDATE_FONT_FAMILY', type: 'UPDATE_FONT_FAMILY',
cardFont, cardFont,
}); });
} }
changeCardFontSize(size: number) {
this.dispatch({
type: 'UPDATE_FONT_SIZE',
size,
});
}
//#region Saved Pages //#region Saved Pages
async initSavedPages() { async initSavedPages() {
@ -698,7 +705,7 @@ export class AppService extends createStateService(reducer, initialState) {
const result = await this.getPassageFromApi(ref.Section); const result = await this.getPassageFromApi(ref.Section);
return { return {
qry: ref.toString(), qry: ref.toString(),
dict: ref.Section.start.book.book_number > 39 ? 'G' : 'H', dict: ref.Section.start.book.bookNumber > 39 ? 'G' : 'H',
type: 'Passage', type: 'Passage',
data: result, data: result,
}; };
@ -713,16 +720,16 @@ export class AppService extends createStateService(reducer, initialState) {
ref: BibleReference.toString(section), ref: BibleReference.toString(section),
}; };
if (Number(section.start.chapter) > section.start.book.last_chapter) { if (Number(section.start.chapter) > section.start.book.lastChapter) {
this.dispatchError( this.dispatchError(
`The requested chapter ${section.start.book.name} is out of range. Please pick a chapter between 1 and ${section.end.book.last_chapter}.` `The requested chapter ${section.start.book.name} is out of range. Please pick a chapter between 1 and ${section.end.book.lastChapter}.`
); );
return; return;
} }
if (Number(section.end.chapter) > section.end.book.last_chapter) { if (Number(section.end.chapter) > section.end.book.lastChapter) {
this.dispatchError( this.dispatchError(
`The requested chapter ${section.end.book.name} is out of range. Please pick a chapter between 1 and ${section.end.book.last_chapter}.` `The requested chapter ${section.end.book.name} is out of range. Please pick a chapter between 1 and ${section.end.book.lastChapter}.`
); );
return; return;
} }
@ -735,7 +742,7 @@ export class AppService extends createStateService(reducer, initialState) {
try { try {
const d = await this.http const d = await this.http
.get<BiblePassage>( .get<BiblePassage>(
`${this.dataPath}/bibles/kjv_strongs/${section.start.book.book_number}-${i}.json` `${this.dataPath}/bibles/kjv_strongs/${section.start.book.bookNumber}-${i}.json`
) )
.toPromise(); .toPromise();
chapters.push(d); chapters.push(d);
@ -797,7 +804,7 @@ export class AppService extends createStateService(reducer, initialState) {
// convert into paragraphs. // convert into paragraphs.
result.cs = await this.convertToParagraphPassages(passages, section); result.cs = await this.convertToParagraphPassages(passages, section);
if (section.start.book.book_number >= 40) { if (section.start.book.bookNumber >= 40) {
result.testament = 'new'; result.testament = 'new';
} else { } else {
result.testament = 'old'; result.testament = 'old';
@ -872,7 +879,7 @@ export class AppService extends createStateService(reducer, initialState) {
private getRefKey(vs: BibleVerse, section: Section) { private getRefKey(vs: BibleVerse, section: Section) {
return BibleReference.formatReferenceKey( return BibleReference.formatReferenceKey(
section.start.book.book_number, section.start.book.bookNumber,
section.start.chapter, section.start.chapter,
vs.v vs.v
); );
@ -1361,7 +1368,7 @@ export class AppService extends createStateService(reducer, initialState) {
if ( if (
item.name !== 'Unknown' && item.name !== 'Unknown' &&
(item.name.toLowerCase().indexOf(qry.toLowerCase()) > -1 || (item.name.toLowerCase().indexOf(qry.toLowerCase()) > -1 ||
item.short_name.toLowerCase().indexOf(qry.toLowerCase()) > -1) item.abbreviation.toLowerCase().indexOf(qry.toLowerCase()) > -1)
) { ) {
words.push(prefix + item.name); words.push(prefix + item.name);
if (words.length > 2) { if (words.length > 2) {