Skip to content

Commit a7d79ce

Browse files
Merge pull request #1097 from unfoldingWord/develop-merges-plusfixes-zpp-cn-1201
Additional fixes for 1530
2 parents c895147 + 9f66bb7 commit a7d79ce

File tree

4 files changed

+42
-5
lines changed

4 files changed

+42
-5
lines changed

public/build_number

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
101-5e4bcea
1+
102-968a963

src/components/translatable/RowHeaderTq.js

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
1-
import React from 'react';
1+
import React, {
2+
useState, useEffect,
3+
} from 'react';
24
import isEqual from 'lodash.isequal';
35
import { makeStyles } from '@material-ui/core/styles';
46

57
import { Typography } from '@material-ui/core';
8+
import QuoteSelector from './QuoteSelector';
69

710
function RowHeaderTq({
811
bookId,
912
rowData,
1013
actionsMenu,
1114
delimiters,
15+
open,
1216
}) {
1317
const classes = useStyles();
14-
const reference = rowData[0].split(delimiters.cell)[0]
18+
const _quote = rowData[3].split(delimiters.cell)[1];
19+
const [quote, setQuote] = useState(_quote);
20+
21+
useEffect(() => {
22+
setQuote(_quote);
23+
}, [_quote]);
24+
25+
const book = bookId;
26+
const chapter = rowData[0].split(delimiters.cell)[1].split(':')[0];
27+
const verse = rowData[0].split(delimiters.cell)[1].split(':')[1];
28+
const occurrence = rowData[4].split(delimiters.cell)[1];
29+
const reference = {
30+
bookId: book.toLowerCase(),
31+
chapter: parseInt(chapter),
32+
verse: parseInt(verse),
33+
};
34+
1535
let _component = (
1636
<div className={classes.defaultHeader}>
1737
<Typography variant='h6' className={classes.title}>
@@ -20,6 +40,23 @@ function RowHeaderTq({
2040
{actionsMenu}
2141
</div>
2242
);
43+
44+
if (reference && reference.bookId && reference.chapter && reference.verse) {
45+
_component = (
46+
<div className={classes.quoteHeader}>
47+
<QuoteSelector
48+
reference={reference}
49+
quote={quote}
50+
onQuote={setQuote}
51+
occurrence={occurrence}
52+
height='250px'
53+
buttons={actionsMenu}
54+
open={open}
55+
/>
56+
</div>
57+
);
58+
}
59+
2360
return _component;
2461
};
2562

src/components/translatable/TranslatableObsTqTSV.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const _config = {
3333
compositeKeyIndices: [0, 1],
3434
columnsFilter: ['Reference', 'ID', 'Question','Response'],
3535
columnsShowDefault: [
36-
'Reference','Questions','Response',
36+
'Question','Response',
3737
],
3838
}
3939
;

src/components/translatable/TranslatableTqTSV.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const _config = {
3131
compositeKeyIndices: [0, 1],
3232
columnsFilter: ['Reference', 'ID', 'Question','Response'],
3333
columnsShowDefault: [
34-
'Reference','Questions','Response',
34+
'Question','Response',
3535
],
3636
}
3737
;

0 commit comments

Comments
 (0)