ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4854 from CatoTH/OS3-bugfix-missing-text-in-pdf-diff-view

Browse Source 
Bugfix: missing text in PDF-exported diff view
This commit is contained in:
Emanuel Schütze 2019-07-14 20:59:50 +02:00 committed by GitHub
commit a365cb9edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
client/src/app/core/repositories/motions/motion-repository.service.ts
View File

@ -537,39 +537,38 @@ export class MotionRepositoryService extends BaseIsAgendaItemAndListOfSpeakersCo
return this.diff.getTextWithChanges(targetMotion.text, changes, lineLength, highlightLine); return this.diff.getTextWithChanges(targetMotion.text, changes, lineLength, highlightLine);
case ChangeRecoMode.Diff: case ChangeRecoMode.Diff:
let text = ''; let text = '';
changes const changesToShow = changes.filter(change => {
.filter(change => { return change.showInDiffView();
return change.showInDiffView(); });
}) changesToShow.forEach((change: ViewUnifiedChange, idx: number) => {
.forEach((change: ViewUnifiedChange, idx: number) => { if (idx === 0) {
if (idx === 0) { text += this.diff.extractMotionLineRange(
text += this.diff.extractMotionLineRange( targetMotion.text,
targetMotion.text, {
{ from: 1,
from: 1, to: change.getLineFrom()
to: change.getLineFrom() },
}, true,
true, lineLength,
lineLength, highlightLine
highlightLine );
); } else if (changes[idx - 1].getLineTo() < change.getLineFrom()) {
} else if (changes[idx - 1].getLineTo() < change.getLineFrom()) { text += this.diff.extractMotionLineRange(
text += this.diff.extractMotionLineRange( targetMotion.text,
targetMotion.text, {
{ from: changes[idx - 1].getLineTo(),
from: changes[idx - 1].getLineTo(), to: change.getLineFrom()
to: change.getLineFrom() },
}, true,
true, lineLength,
lineLength, highlightLine
highlightLine );
); }
} text += this.diff.getChangeDiff(targetMotion.text, change, lineLength, highlightLine);
text += this.diff.getChangeDiff(targetMotion.text, change, lineLength, highlightLine); });
});
text += this.diff.getTextRemainderAfterLastChange( text += this.diff.getTextRemainderAfterLastChange(
targetMotion.text, targetMotion.text,
changes, changesToShow,
lineLength, lineLength,
highlightLine highlightLine
); );

1
client/src/app/site/motions/services/motion-pdf.service.ts
View File

@ -612,7 +612,6 @@ export class MotionPdfService {
motionText = this.motionRepo.formatStatuteAmendment(statutes, motion, lineLength); motionText = this.motionRepo.formatStatuteAmendment(statutes, motion, lineLength);
} else { } else {
// lead motion or normal amendments // lead motion or normal amendments
// TODO: Consider tile change recommendation
const changes = this.getUnifiedChanges(motion, lineLength); const changes = this.getUnifiedChanges(motion, lineLength);
const textChanges = changes.filter(change => !change.isTitleChange()); const textChanges = changes.filter(change => !change.isTitleChange());