Compare commits

..

16 Commits

Author SHA1 Message Date
12c1d92ec4 1.0.99 2024-02-16 19:18:21 +01:00
4769548dad fix(core): update 2024-02-16 19:18:20 +01:00
1ebfa25695 1.0.98 2024-01-15 13:02:31 +01:00
e519ba6ebe fix(core): update 2024-01-15 13:02:30 +01:00
5736f2b7d3 1.0.97 2023-11-26 16:59:05 +01:00
0d5dc9a82f fix(core): update 2023-11-26 16:59:04 +01:00
86366d86b9 1.0.96 2023-10-26 17:39:03 +02:00
855ce7c074 fix(core): update 2023-10-26 17:39:02 +02:00
5d655035d6 1.0.95 2023-10-26 12:26:05 +02:00
e994c80e34 fix(core): update 2023-10-26 12:26:05 +02:00
861b7875d3 1.0.94 2023-10-25 19:11:34 +02:00
610b2ba0d1 fix(core): update 2023-10-25 19:11:34 +02:00
fac20675e6 1.0.93 2023-10-25 18:37:57 +02:00
e5249b7ed0 fix(core): update 2023-10-25 18:37:57 +02:00
2855e1ec2b 1.0.92 2023-10-17 12:00:37 +02:00
942173e905 fix(core): update 2023-10-17 12:00:36 +02:00
12 changed files with 1053 additions and 734 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-document", "name": "@design.estate/dees-document",
"version": "1.0.91", "version": "1.0.99",
"private": false, "private": false,
"description": "a catalog for creating documents like invoices", "description": "a catalog for creating documents like invoices",
"main": "dist_ts_web/index.js", "main": "dist_ts_web/index.js",
@ -12,31 +12,32 @@
"scripts": { "scripts": {
"test": "npm run build && tstest test/", "test": "npm run build && tstest test/",
"build": "tsbuild --allowimplicitany && tsbuild element --allowimplicitany && tsbundle element --production", "build": "tsbuild --allowimplicitany && tsbuild element --allowimplicitany && tsbundle element --production",
"watch": "tswatch element" "watch": "tswatch element",
"buildDocs": "tsdoc"
}, },
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@design.estate/dees-domtools": "^2.0.34", "@design.estate/dees-domtools": "^2.0.55",
"@design.estate/dees-element": "^2.0.23", "@design.estate/dees-element": "^2.0.33",
"@design.estate/dees-wcctools": "^1.0.76", "@design.estate/dees-wcctools": "^1.0.85",
"@git.zone/tsrun": "^1.2.44", "@git.zone/tsrun": "^1.2.46",
"@push.rocks/smartfile": "^10.0.26", "@push.rocks/smartfile": "^11.0.4",
"@push.rocks/smartjson": "^5.0.10", "@push.rocks/smartjson": "^5.0.10",
"@push.rocks/smartpath": "^5.0.5", "@push.rocks/smartpath": "^5.0.11",
"@push.rocks/smartpdf": "^3.0.16", "@push.rocks/smartpdf": "^3.0.16",
"@push.rocks/smarttime": "^4.0.1", "@push.rocks/smarttime": "^4.0.6",
"@tsclass/tsclass": "^4.0.46", "@tsclass/tsclass": "^4.0.46",
"@types/qrcode": "^1.5.2", "@types/qrcode": "^1.5.5",
"qrcode": "^1.5.3" "qrcode": "^1.5.3"
}, },
"devDependencies": { "devDependencies": {
"@git.zone/tsbuild": "^2.1.66", "@git.zone/tsbuild": "^2.1.72",
"@git.zone/tsbundle": "^2.0.8", "@git.zone/tsbundle": "^2.0.15",
"@git.zone/tstest": "^1.0.77", "@git.zone/tstest": "^1.0.84",
"@git.zone/tswatch": "^2.0.7", "@git.zone/tswatch": "^2.0.21",
"@push.rocks/projectinfo": "^5.0.1", "@push.rocks/projectinfo": "^5.0.2",
"@push.rocks/tapbundle": "^5.0.8" "@push.rocks/tapbundle": "^5.0.15"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",

1380
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -131,6 +131,75 @@ tap.test('should create an invoice', async () => {
vatPercentage: 19, vatPercentage: 19,
currency: 'EUR', currency: 'EUR',
}, },
{
name: 'Overnight Shipping',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 24,
currency: 'EUR',
},{
name: 'Website Creation',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 0,
currency: 'EUR',
},
{
name: 'Hosting',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 19,
currency: 'EUR',
},
{
name: 'Overnight Shipping',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 24,
currency: 'EUR',
},{
name: 'Website Creation',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 0,
currency: 'EUR',
},
{
name: 'Hosting',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 19,
currency: 'EUR',
},
{
name: 'Overnight Shipping',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 24,
currency: 'EUR',
},{
name: 'Website Creation',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 0,
currency: 'EUR',
},
{
name: 'Hosting',
unitQuantity: 1,
unitNetPrice: 1200,
unitType: 'item',
vatPercentage: 19,
currency: 'EUR',
},
{ {
name: 'Overnight Shipping', name: 'Overnight Shipping',
unitQuantity: 1, unitQuantity: 1,

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-document', name: '@design.estate/dees-document',
version: '1.0.91', version: '1.0.99',
description: 'a catalog for creating documents like invoices' description: 'a catalog for creating documents like invoices'
} }

View File

@ -10,6 +10,13 @@ export interface IPdfServiceConstructorOptions {
* a pdf service for generating pdfs * a pdf service for generating pdfs
*/ */
export class PdfService { export class PdfService {
// STATIC
public static async createAndStart(optionsArg: IPdfServiceConstructorOptions) {
const pdfService = new PdfService(optionsArg);
await pdfService.start();
return pdfService;
}
// INSTANCE // INSTANCE
options: IPdfServiceConstructorOptions; options: IPdfServiceConstructorOptions;

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-document', name: '@design.estate/dees-document',
version: '1.0.91', version: '1.0.99',
description: 'a catalog for creating documents like invoices' description: 'a catalog for creating documents like invoices'
} }

View File

@ -0,0 +1,6 @@
import * as shared from './shared/index.js';
import { html } from '@design.estate/dees-element';
export const demoFunc = () => html`
<dedocument-dedocument .format="${'a4'}" .letterData=${shared.demoLetter}></dedocument-dedocument>
`;

View File

@ -18,6 +18,7 @@ import { DePage } from './page.js';
import { DeContentInvoice } from './contentinvoice.js'; import { DeContentInvoice } from './contentinvoice.js';
import * as shared from './shared/index.js'; import * as shared from './shared/index.js';
import { demoFunc } from './document.demo.js';
declare global { declare global {
interface HTMLElementTagNameMap { interface HTMLElementTagNameMap {
@ -27,9 +28,7 @@ declare global {
@customElement('dedocument-dedocument') @customElement('dedocument-dedocument')
export class DeDocument extends DeesElement { export class DeDocument extends DeesElement {
public static demo = () => html` public static demo = demoFunc;
<dedocument-dedocument .format="${'a4'}" .letterData=${shared.demoLetter}></dedocument-dedocument>
`;
@property({ @property({
type: String, type: String,
@ -39,7 +38,12 @@ export class DeDocument extends DeesElement {
@property({ @property({
type: Number, type: Number,
}) })
public viewWidth: number = shared.a4Width; public viewWidth: number = null;
@property({
type: Number,
})
public viewHeight: number = null;
@property({ @property({
type: Boolean, type: Boolean,
@ -81,28 +85,31 @@ export class DeDocument extends DeesElement {
} }
.betweenPagesSpacer { .betweenPagesSpacer {
height: 20px; height: 16px;
} }
`, `,
]; ];
public render(): TemplateResult { public render(): TemplateResult {
return html` return html`
<style> <div class="documentContainer"></div>
:host {
transform-origin: top left;
transform: ${this.viewWidth
? unsafeCSS(
`scale(${this.viewWidth / shared.a4Width}, ${this.viewWidth / shared.a4Width})`
)
: unsafeCSS('')};
}
</style>
<div class="scaleport"></div>
`; `;
} }
public async firstUpdated(_changedProperties: Map<string | number | symbol, unknown>) { public async firstUpdated(_changedProperties: Map<string | number | symbol, unknown>) {
const resizeObserver = new ResizeObserver((entries) => {
for (const entry of entries) {
const width = entry.contentRect.width;
const height = entry.contentRect.height;
// Handle the new dimensions here
this.adjustDePageScaling();
}
});
resizeObserver.observe(this);
this.registerGarbageFunction(() => {
resizeObserver.disconnect();
})
if (this.letterDataUrl) { if (this.letterDataUrl) {
const response = await fetch(this.letterDataUrl); const response = await fetch(this.letterDataUrl);
this.letterData = await response.json(); this.letterData = await response.json();
@ -112,7 +119,7 @@ export class DeDocument extends DeesElement {
public async renderDocument() { public async renderDocument() {
const domtools = await this.domtoolsPromise; const domtools = await this.domtoolsPromise;
const scaleport = this.shadowRoot.querySelector('.scaleport'); const documentContainer = this.shadowRoot.querySelector('.documentContainer');
let pages: DePage[] = []; let pages: DePage[] = [];
let pageCounter = 0; let pageCounter = 0;
let complete = false; let complete = false;
@ -135,12 +142,12 @@ export class DeDocument extends DeesElement {
newPage.pageNumber = pageCounter; newPage.pageNumber = pageCounter;
newPage.append(currentContent); newPage.append(currentContent);
newPage.pageTotalNumber = pageCounter; newPage.pageTotalNumber = pageCounter;
scaleport.append(newPage); documentContainer.append(newPage);
// betweenPagesSpacer // betweenPagesSpacer
if (!this.printMode) { if (!this.printMode) {
const betweenPagesSpacerDiv = document.createElement('div'); const betweenPagesSpacerDiv = document.createElement('div');
betweenPagesSpacerDiv.classList.add('betweenPagesSpacer'); betweenPagesSpacerDiv.classList.add('betweenPagesSpacer');
scaleport.append(betweenPagesSpacerDiv); documentContainer.append(betweenPagesSpacerDiv);
} }
await currentContent.elementDomReady; await currentContent.elementDomReady;
await currentContent.trimStartToOffset(overallContentOffset); await currentContent.trimStartToOffset(overallContentOffset);
@ -164,5 +171,34 @@ export class DeDocument extends DeesElement {
for (const page of pages) { for (const page of pages) {
page.pageTotalNumber = pageCounter; page.pageTotalNumber = pageCounter;
} }
this.adjustDePageScaling();
}
updated(changedProperties: Map<string | number | symbol, unknown>): void {
super.updated(changedProperties);
if (changedProperties.has('viewHeight') || changedProperties.has('viewWidth')) {
this.adjustDePageScaling();
}
}
private adjustDePageScaling() {
if (this.printMode) {
return;
}
this.viewWidth = this.clientWidth;
// Find all DePage instances within this DeDocument
const pages = this.shadowRoot.querySelectorAll('dedocument-page');
// Update each DePage instance's viewHeight and viewWidth
pages.forEach((page: DePage) => {
if (this.viewHeight) {
page.viewHeight = this.viewHeight;
}
if (this.viewWidth) {
page.viewWidth = this.viewWidth;
console.log('setting viewWidth: ', this.viewWidth);
}
});
} }
} }

View File

@ -6,3 +6,6 @@ export * from './pagecontainer.js';
export * from './pagecontent.js'; export * from './pagecontent.js';
export * from './pagefooter.js'; export * from './pagefooter.js';
export * from './pageheader.js'; export * from './pageheader.js';
export * from './viewer.js';
export * from './shared/index.js';

View File

@ -23,6 +23,12 @@ declare global {
export class DePage extends DeesElement { export class DePage extends DeesElement {
public static demo = () => html` <dedocument-page .format="${'a4'}"></dedocument-page> `; public static demo = () => html` <dedocument-page .format="${'a4'}"></dedocument-page> `;
@property()
viewWidth: number = null;
@property()
viewHeight: number = null;
@property({ @property({
type: String, type: String,
}) })
@ -41,7 +47,7 @@ export class DePage extends DeesElement {
@property({ @property({
type: Object, type: Object,
}) })
public letterData: tsclass.business.ILetter = shared.demoLetter; public letterData: tsclass.business.ILetter = null;
@property({ @property({
type: Boolean, type: Boolean,
@ -58,7 +64,15 @@ export class DePage extends DeesElement {
domtools.elementBasic.staticStyles, domtools.elementBasic.staticStyles,
css` css`
:host { :host {
display: block;
max-height: ${shared.a4Height}px;
max-width: ${shared.a4Width}px;
} }
#scaleWrapper {
transform-origin: top left;
}
.versionOverlay { .versionOverlay {
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
@ -93,7 +107,10 @@ export class DePage extends DeesElement {
public render(): TemplateResult { public render(): TemplateResult {
return html` return html`
<div id="scaleWrapper">
<dedocument-pagecontainer .printMode=${this.printMode}> <dedocument-pagecontainer .printMode=${this.printMode}>
${this.letterData
? html`
<dedocument-pageheader <dedocument-pageheader
.letterData=${this.letterData} .letterData=${this.letterData}
.pageNumber="${this.pageNumber}" .pageNumber="${this.pageNumber}"
@ -123,14 +140,19 @@ export class DePage extends DeesElement {
${this.letterData.versionInfo.type === 'draft' ${this.letterData.versionInfo.type === 'draft'
? html` ? html`
<div class="topInfo"> <div class="topInfo">
Please note: THIS IS A DRAFT ONLY. NO RIGHTS CAN BE DERIVED FROM THIS.<br> Please note: THIS IS A DRAFT ONLY. NO RIGHTS CAN BE DERIVED FROM THIS.<br />
-> Revision/Document version: ${this.letterData.versionInfo.version} -> Revision/Document version: ${this.letterData.versionInfo.version}
</div> </div>
<div class="bigDraftText">DRAFT</div> <div class="bigDraftText">DRAFT</div>
` `
: html``} : html``}
</div> </div>
`
: html`
<slot></slot>
`}
</dedocument-pagecontainer> </dedocument-pagecontainer>
</div>
`; `;
} }
@ -139,4 +161,32 @@ export class DePage extends DeesElement {
const pageContent = this.shadowRoot.querySelector('dedocument-pagecontent'); const pageContent = this.shadowRoot.querySelector('dedocument-pagecontent');
return pageContent.checkOverflow(); return pageContent.checkOverflow();
} }
updated(changedProperties: Map<string | number | symbol, unknown>): void {
super.updated(changedProperties);
if (changedProperties.has('viewHeight') || changedProperties.has('viewWidth')) {
this.adjustScaling();
}
}
private adjustScaling() {
console.log('page scale adjustment triggered.');
const scaleWrapper: HTMLDivElement = this.shadowRoot.querySelector('#scaleWrapper');
if (!scaleWrapper) return;
let scale = 1;
if (this.viewHeight) {
scale = this.viewHeight / shared.a4Height;
} else if (this.viewWidth) {
scale = this.viewWidth / shared.a4Width;
}
console.log(`new scale is ${scale}`);
scaleWrapper.style.transform = `scale(${scale})`;
// Adjust the outer dimensions so they match the scaled content
// this.style.width = `${shared.a4Width * scale}px`;
this.style.height = `${shared.a4Height * scale}px`;
}
} }

View File

@ -0,0 +1,6 @@
import { html } from '@design.estate/dees-element';
import * as shared from './shared/index.js';
export const demoFunc = () => html`
<dedocument-viewer .letterData=${shared.demoLetter}></dedocument-viewer>
`;

83
ts_web/elements/viewer.ts Normal file
View File

@ -0,0 +1,83 @@
import * as plugins from '../plugins.js';
import { DeesElement, css, cssManager, customElement, html } from '@design.estate/dees-element';
import { demoFunc } from './viewer.demo.js';
declare global {
interface HTMLElementTagNameMap {
'dedocument-viewer': DeDocumentViewer;
}
}
@customElement('dedocument-viewer')
export class DeDocumentViewer extends DeesElement {
// DEMO
public static demo = demoFunc;
// INSTANCE
public letterData: plugins.tsclass.business.ILetter = null;
public static styles = [
cssManager.defaultStyles,
css`
.maincontainer {
position: relative;
height: 100%;
width: 100%;
background: ${cssManager.bdTheme('#eeeeeb', '#111')};
}
.controls {
top: 0px;
right: 0px;
left: 0px;
position: absolute;
height: 32px;
width: 100%;
background: ${cssManager.bdTheme('#eeeeeb', '#111111ee')};
box-shadow: 0px 2px 8px 0px #000000;
}
.controlsShadow {
position: absolute;
top: 32px;
right: 0px;
left: 0px;
height: 16px;
width: 100%;
position: absolute;
background: linear-gradient(to bottom, #111111cc 0%, #11111100 100%);
}
.viewport {
position: absolute;
padding: 16px;
padding-top: 48px;
padding-bottom: 0px;
top: 0px;
left: 0px;
right: 0px;
bottom: 0px;
overflow-y: scroll;
overscroll-behavior: contain;
}
`,
];
public render = () => {
return html`
<div class="maincontainer">
<div class="viewport">
${this.letterData
? html` <dedocument-dedocument .letterData=${this.letterData}></dedocument-dedocument> `
: html``}
</div>
<div class="controls"></div>
</div>
`;
};
public updated = (changedProperties: Map<string | number | symbol, unknown>) => {
super.updated(changedProperties);
if (changedProperties.has('letterData')) {
}
};
}