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

read crmode from the projector element

Browse Source
This commit is contained in:
FinnStutzenstein 2019-02-14 12:52:39 +01:00 committed by Emanuel Schütze
parent 453fedbc3e
commit 35cd49e4fe
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,15 +4,14 @@ import { TranslateService } from '@ngx-translate/core';
import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service'; import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
import { ConfigService } from 'app/core/ui-services/config.service'; import { ConfigService } from 'app/core/ui-services/config.service';
import { ViewUnifiedChange } from '../../../shared/models/motions/view-unified-change';
import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service'; import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service';
import { MotionPollService, CalculablePollKey } from './motion-poll.service'; import { MotionPollService, CalculablePollKey } from './motion-poll.service';
import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service'; import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service';
import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion'; import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion';
import { ViewUnifiedChange } from '../models/view-unified-change';
import { LinenumberingService } from 'app/core/ui-services/linenumbering.service'; import { LinenumberingService } from 'app/core/ui-services/linenumbering.service';
import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service'; import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service';
import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change';
/** /**
* Type declaring which strings are valid options for metainfos to be exported into a pdf * Type declaring which strings are valid options for metainfos to be exported into a pdf

3
client/src/app/slides/motions/motion/motions-motion-slide.component.ts
View File

@ -54,8 +54,9 @@ export class MotionsMotionSlideComponent extends BaseSlideComponent<MotionsMotio
this._data = value; this._data = value;
this.lnMode = value.data.line_numbering_mode; this.lnMode = value.data.line_numbering_mode;
this.lineLength = value.data.line_length; this.lineLength = value.data.line_length;
this.crMode = value.data.change_recommendation_mode;
this.preamble = value.data.preamble; this.preamble = value.data.preamble;
this.crMode = value.element.mode || 'original';
console.log(this.crMode);
this.recalcUnifiedChanges(); this.recalcUnifiedChanges();
} }

4
openslides/motions/projector.py
View File

@ -109,7 +109,7 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
* change_recommendations * change_recommendations
* submitter * submitter
""" """
mode = element.get("mode") mode = element.get("mode", "original")
motion_id = element.get("id") motion_id = element.get("id")
if motion_id is None: if motion_id is None:
@ -123,7 +123,6 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
show_meta_box = not get_config(all_data, "motions_disable_sidebox_on_projector") show_meta_box = not get_config(all_data, "motions_disable_sidebox_on_projector")
line_length = get_config(all_data, "motions_line_length") line_length = get_config(all_data, "motions_line_length")
line_numbering_mode = get_config(all_data, "motions_default_line_numbering") line_numbering_mode = get_config(all_data, "motions_default_line_numbering")
change_recommendation_mode = get_config(all_data, "motions_recommendation_text_mode")
motions_preamble = get_config(all_data, "motions_preamble") motions_preamble = get_config(all_data, "motions_preamble")
if motion["statute_paragraph_id"]: if motion["statute_paragraph_id"]:
@ -155,7 +154,6 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
"show_meta_box": show_meta_box, "show_meta_box": show_meta_box,
"change_recommendations": change_recommendations, "change_recommendations": change_recommendations,
"amendments": amendments, "amendments": amendments,
"change_recommendation_mode": change_recommendation_mode,
"line_length": line_length, "line_length": line_length,
"line_numbering_mode": line_numbering_mode, "line_numbering_mode": line_numbering_mode,
} }