Skip to content

Commit

Permalink
Merge pull request #265 from surveyjs/bug/264
Browse files Browse the repository at this point in the history 
Work for #264: fix detailPanel for matrixdropdown
  • Loading branch information
@andrewtelnov
andrewtelnov authored Aug 29, 2023
2 parents 21c18b0 + c21094d commit 97eaced
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 11 deletions.
32 changes: 21 additions & 11 deletions src/flat_layout/flat_matrixmultiple.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ export class FlatMatrixMultiple extends FlatQuestion {
}
return composite;
}
private get hasDetailPanel(): boolean {
return this.visibleRows.some((renderedRow) => renderedRow.row && this.question.hasDetailPanel(renderedRow.row));
}
private ignoreCell(cell: QuestionMatrixDropdownRenderedCell, index: number): boolean {
return !(cell.hasQuestion || cell.hasTitle || (this.isMultiple && index == 0));
return !(cell.hasQuestion || cell.hasTitle || (this.isMultiple && (this.hasDetailPanel ? index == 1 : index == 0)));
}
private async generateFlatsRowHorisontal(point: IPoint, row: QuestionMatrixDropdownRenderedRow,
colCount: number, columnWidth: number[]): Promise<CompositeBrick> {
Expand Down Expand Up @@ -157,16 +160,19 @@ export class FlatMatrixMultiple extends FlatQuestion {
for (let i: number = 0; i < rows.length; i++) {
let rowFlat: CompositeBrick = await this.generateOneRow(currPoint, rows[i], colCount,
isWide, this.calculateColumnWidth(rows, colCount));
if (rowFlat.isEmpty) continue;
if (i !== rows.length - 1) {
currPoint.yTop = rowFlat.yBot;
rowFlat.addBrick(SurveyHelper.createRowlineFlat(currPoint, this.controller));
if (rowFlat.isEmpty && !(rows[i].row && rows[i].row.hasPanel)) continue;
if(!rowFlat.isEmpty) {
if (i !== rows.length - 1) {
currPoint.yTop = rowFlat.yBot;
rowFlat.addBrick(SurveyHelper.createRowlineFlat(currPoint, this.controller));
}
rowsFlats.push(rowFlat);
currPoint.yTop = rowFlat.yBot + FlatMatrixMultiple.GAP_BETWEEN_ROWS * this.controller.unitHeight;
}
rowsFlats.push(rowFlat);
currPoint.yTop = rowFlat.yBot + FlatMatrixMultiple.GAP_BETWEEN_ROWS * this.controller.unitHeight;

if (!!rows[i].row && rows[i].row.hasPanel) {
const currentDetailPanel: PanelModel = (this.question as any).detailPanelValue;
rows[i].row.showDetailPanel();
const currentDetailPanel: PanelModel = rows[i].row.detailPanel;
for (let j = 0; j < currentDetailPanel.questions.length; j++) {
currentDetailPanel.questions[j].id += '_' + i;
}
Expand All @@ -181,8 +187,12 @@ export class FlatMatrixMultiple extends FlatQuestion {
if (i !== rows.length - 1 && this.question.renderedTable.showHeader && isWide) {
const header: CompositeBrick = await this.generateOneRow(currPoint, rows[0], colCount,
isWide, this.calculateColumnWidth(rows, colCount));
currPoint.yTop = header.yBot + FlatMatrixMultiple.GAP_BETWEEN_ROWS * this.controller.unitHeight;
rowsFlats.push(header);
let currYTop = currComposite.yBot;
if(!header.isEmpty) {
currYTop = header.yBot;
rowsFlats.push(header);
}
currPoint.yTop = currYTop + FlatMatrixMultiple.GAP_BETWEEN_ROWS * this.controller.unitHeight;
}
}
}
Expand Down Expand Up @@ -218,7 +228,7 @@ export class FlatMatrixMultiple extends FlatQuestion {
colCount = table.showHeader && table.headerRow ? table.headerRow.cells.length :
table.showFooter && table.footerRow ? table.footerRow.cells.length : 0;
}
if (colCount === 0) {
if (colCount === 0 && !this.hasDetailPanel) {
return [new CompositeBrick(SurveyHelper.createRowlineFlat(point, this.controller))];
}
const isWide = this.calculateIsWide(table, colCount);
Expand Down
134 changes: 134 additions & 0 deletions tests/flat_matrixmultiple.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import { IPdfBrick } from '../src/pdf_render/pdf_brick';
import { SurveyHelper } from '../src/helper_survey';
import { TestHelper } from '../src/helper_test';
import { QuestionMatrixDropdownModel } from 'survey-core';
import { FlatRepository } from '../src/flat_layout/flat_repository';
import { CompositeBrick } from '../src/pdf_render/pdf_composite';
let __dummy_dd = new FlatDropdown(null, null, null);
let __dummy_mm = new FlatMatrixMultiple(null, null, null);

Expand Down Expand Up @@ -700,4 +702,136 @@ test('Check getRowsToRender method', async () => {

expect(rows[0] === table.rows[1]).toBeTruthy();
expect(rows[1] === table.footerRow).toBeTruthy();
});

test('Check matrix multiple one column one row with detailPanel', async () => {
const json: any = {
showQuestionNumbers: 'off',
elements: [
{
type: 'matrixdropdown',
name: 'detailPanelChecker',
titleLocation: 'hidden',
hideNumber: true,
columns: [
{
name: 'Col1',
}
],
detailElements: [
{
type: 'comment',
name: 'commentInPanel',
titleLocation: 'hidden',
}
],
rows: ['Row1'],
detailPanelMode: 'underRow',
}
]
};
const survey: SurveyPDF = new SurveyPDF(json, TestHelper.defaultOptions);
const question = <QuestionMatrixDropdownModel>survey.getAllQuestions()[0];
const controller: DocController = new DocController(TestHelper.defaultOptions);
const flats: IPdfBrick[][] = await FlatSurvey.generateFlats(survey, controller);
expect(flats.length).toBe(1);
expect(flats[0].length).toBe(3);
controller.margins.left += controller.unitWidth;
const unfoldHeaderFlats: IPdfBrick[] = flats[0][0].unfold();
expect(unfoldHeaderFlats.length).toBe(2);
const unfoldRowFlats: IPdfBrick[] = flats[0][1].unfold();
expect(unfoldRowFlats.length).toBe(2);
const header: ISize = controller.measureText(json.elements[0].columns[0].name, 'bold');
const assumeMatrix: IRect = {
xLeft: controller.leftTopPoint.xLeft,
xRight: controller.paperWidth - controller.margins.right,
yTop: controller.leftTopPoint.yTop,
yBot: controller.leftTopPoint.yTop + header.height +
SurveyHelper.EPSILON + controller.unitHeight * (1 + FlatMatrixMultiple.GAP_BETWEEN_ROWS)
};
TestHelper.equalRect(expect, SurveyHelper.mergeRects(flats[0][0], flats[0][1]), assumeMatrix);
const assumeHeader: IRect = {
xLeft: controller.leftTopPoint.xLeft +
SurveyHelper.getPageAvailableWidth(controller) / 2.0 +
SurveyHelper.GAP_BETWEEN_COLUMNS * controller.unitWidth / 2.0,
xRight: controller.leftTopPoint.xLeft +
SurveyHelper.getPageAvailableWidth(controller) / 2.0 +
SurveyHelper.GAP_BETWEEN_COLUMNS * controller.unitWidth / 2.0 +
header.width,
yTop: controller.leftTopPoint.yTop,
yBot: controller.leftTopPoint.yTop + header.height
};
TestHelper.equalRect(expect, unfoldHeaderFlats[0], assumeHeader);
const rowText: ISize = controller.measureText(json.elements[0].rows[0]);
const assumeRowText: IRect = {
xLeft: controller.leftTopPoint.xLeft,
xRight: controller.leftTopPoint.xLeft + rowText.width,
yTop: assumeHeader.yBot + SurveyHelper.EPSILON
+ controller.unitHeight * FlatMatrixMultiple.GAP_BETWEEN_ROWS,
yBot: assumeHeader.yBot + SurveyHelper.EPSILON + rowText.height +
controller.unitHeight * FlatMatrixMultiple.GAP_BETWEEN_ROWS
};
TestHelper.equalRect(expect, unfoldRowFlats[0], assumeRowText);
const assumeRowQuestion: IRect = {
xLeft: assumeHeader.xLeft,
xRight: assumeMatrix.xRight,
yTop: assumeRowText.yTop,
yBot: assumeRowText.yTop + controller.unitHeight
};
TestHelper.equalRect(expect, unfoldRowFlats[1], assumeRowQuestion);
question.visibleRows[0].showDetailPanel();
const panel = question.visibleRows[0].detailPanel;
const assumePanelBricks = await FlatSurvey.generateFlatsPanel(
survey, controller, panel, { xLeft: assumeRowText.xLeft, yTop: assumeRowQuestion.yBot + SurveyHelper.EPSILON
+ controller.unitHeight * FlatMatrixMultiple.GAP_BETWEEN_ROWS });
const assumePanelCompositeBrick = new CompositeBrick(...assumePanelBricks);
TestHelper.equalRect(expect, flats[0][2], assumePanelCompositeBrick);
});

test('Check matrix multiple zero columns one row with detailPanel', async () => {
const json: any = {
showQuestionNumbers: 'off',
elements: [
{
type: 'matrixdropdown',
name: 'detailPanelChecker',
titleLocation: 'hidden',
hideNumber: true,
columns: [],
detailElements: [
{
type: 'comment',
name: 'commentInPanel',
titleLocation: 'hidden',
}
],
rows: ['Row1'],
detailPanelMode: 'underRow',
}
]
};
const survey: SurveyPDF = new SurveyPDF(json, TestHelper.defaultOptions);
const question = <QuestionMatrixDropdownModel>survey.getAllQuestions()[0];
const controller: DocController = new DocController(TestHelper.defaultOptions);
const flats: IPdfBrick[][] = await FlatSurvey.generateFlats(survey, controller);
expect(flats.length).toBe(1);
expect(flats[0].length).toBe(2);
controller.margins.left += controller.unitWidth;
const unfoldRowFlats: IPdfBrick[] = flats[0][0].unfold();
expect(unfoldRowFlats.length).toBe(1);
const rowText: ISize = controller.measureText(json.elements[0].rows[0]);
const assumeRowText: IRect = {
xLeft: controller.leftTopPoint.xLeft,
xRight: controller.leftTopPoint.xLeft + rowText.width,
yTop: controller.leftTopPoint.yTop,
yBot: controller.leftTopPoint.yTop + controller.unitHeight
};
TestHelper.equalRect(expect, unfoldRowFlats[0], assumeRowText);
question.visibleRows[0].showDetailPanel();
const panel = question.visibleRows[0].detailPanel;
const assumePanelBricks = await FlatSurvey.generateFlatsPanel(
survey, controller, panel, { xLeft: assumeRowText.xLeft, yTop: assumeRowText.yBot + SurveyHelper.EPSILON
+ controller.unitHeight * FlatMatrixMultiple.GAP_BETWEEN_ROWS });
const assumePanelCompositeBrick = new CompositeBrick(...assumePanelBricks);
TestHelper.equalRect(expect, flats[0][1], assumePanelCompositeBrick);
});

0 comments on commit 97eaced

Please sign in to comment.