Stammdaten: getTaetigkeiten und getAlleMaschinen
getTaetigkeiten liest alle Taetigkeiten (aktiv und inaktiv) mit Bereich und den Flags Maschinen zuordnen, Abwesenheit und Notiz erzwingen. getAlleMaschinen liest alle Kategorien und Seiten und fasst Maschinen, die in mehreren Kategorien stehen, zu einem Eintrag zusammen. Paging ueber .pagination[data-pages], Abbruch sobald eine Seite keine neuen Zeilen bringt. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
bjoernpoettkerandClaude Opus 5.5 committed
1 parent
d2c5db7e22
commit
6db6c5b278
10 files changed
+612
-4
No files matched your search
@@ -97,9 +97,12 @@ The store can read both the connector format and the older Telefonbuch cookie-ar
|
||||
- `setEingangsdatum(rechnungId, datum)` updates the received date.
|
||||
- `getMaschinenKategorien()` reads `/maschinen/kategorien` and returns ID, name, tractor flag, and mobile visibility.
|
||||
- `getMaschinen(gruppenId, suchstring?)` reads `/module/maschinen/livesearch.php` and returns ID, number, name, license plate, and active flag.
|
||||
- `getAlleMaschinen()` reads all machine categories (`maschinengruppe=0`), active and inactive machines, all livesearch pages, and returns each machine once with ID, number, name, license plate, active flag, its first category (`gruppenId`, `gruppe`) and all categories (`gruppenIds`); a machine can be listed in several categories. `getMaschinen()` already sends `maschinen_aktiv=1`, which in Agrarmonitor means active **and** inactive.
|
||||
- `getFirmen()` reads `/einstellungen` and returns company ID and description.
|
||||
- `getArtikelEinheiten()` reads `/artikel/einheiten` and returns unit ID, description, and short label.
|
||||
- `getArtikelKategorien()` reads `/artikel/kategorien` and returns product group ID and name.
|
||||
- `getArtikel(artikelGruppe, suchstring?)` reads `/module/artikel/livesearch.php` and returns article ID, number, and description.
|
||||
- `getMitarbeiter(suchstring?, mitarbeitergruppe?)` reads `/module/mitarbeiter/livesearch.php` and returns employee ID, number, last name, first name, and active flag.
|
||||
- `getTaetigkeiten()` reads `/module/arbeitszeit/taetigkeiten-livesearch.php` (active and inactive) and returns activity ID, UUID, number, name, active flag, area (`bereichId`, `bereich`) and the flags `maschineZuordnen`, `abwesenheit`, `notizErzwingen`.
|
||||
- Agrarmonitor has no cost center master data (`Kostenstelle` is only a free-text field on machines, employees and articles), so there is no `getKostenstellen()`. See `docs/zeitbuchung-analyse.md`.
|
||||
- `saveSession()` explicitly persists the current cookie jar.
|
||||
Vendored
+13
-1
@@ -1,8 +1,9 @@
|
||||
import { type AxiosInstance } from 'axios';
|
||||
import type { AgrarmonitorApiCustomer, AgrarmonitorConnectorOptions, AgrarmonitorConnectorResult, AgrarmonitorDeviceRegistrationOptions, AgrarmonitorDeviceRegistrationResult, AgrarmonitorFetchCustomersOptions, AgrarmonitorFreischaltungStatus, AgrarmonitorKunde2, AgrarmonitorRegistrierungStatus, Artikel, ArtikelEinheit, ArtikelKategorie, EingangsrechnungLivesearchResult, Firma, Maschine, MaschinenKategorie, Mitarbeiter, Rechnungsdaten } from './types';
|
||||
import type { AgrarmonitorApiCustomer, AgrarmonitorConnectorOptions, AgrarmonitorConnectorResult, AgrarmonitorDeviceRegistrationOptions, AgrarmonitorDeviceRegistrationResult, AgrarmonitorFetchCustomersOptions, AgrarmonitorFreischaltungStatus, AgrarmonitorKunde2, AgrarmonitorRegistrierungStatus, Artikel, ArtikelEinheit, ArtikelKategorie, EingangsrechnungLivesearchResult, Firma, Maschine, MaschineMitGruppe, MaschinenKategorie, Mitarbeiter, Rechnungsdaten, Taetigkeit } from './types';
|
||||
export declare class AgrarmonitorConnector implements AgrarmonitorConnectorResult {
|
||||
private readonly options;
|
||||
http: AxiosInstance;
|
||||
private static readonly maxLivesearchSeiten;
|
||||
private static readonly s3DateienBaseUrl;
|
||||
private readonly baseUrl;
|
||||
private readonly apiBaseUrl;
|
||||
@@ -36,11 +37,22 @@ export declare class AgrarmonitorConnector implements AgrarmonitorConnectorResul
|
||||
getCustomerById(id: number): Promise<AgrarmonitorApiCustomer>;
|
||||
getMaschinenKategorien(): Promise<MaschinenKategorie[]>;
|
||||
getMaschinen(gruppenId: number, suchstring?: string): Promise<Maschine[]>;
|
||||
getAlleMaschinen(): Promise<MaschineMitGruppe[]>;
|
||||
getFirmen(): Promise<Firma[]>;
|
||||
getArtikelEinheiten(): Promise<ArtikelEinheit[]>;
|
||||
getArtikelKategorien(): Promise<ArtikelKategorie[]>;
|
||||
getArtikel(artikelGruppe: number, suchstring?: string): Promise<Artikel[]>;
|
||||
getMitarbeiter(suchstring?: string, mitarbeitergruppe?: number): Promise<Mitarbeiter[]>;
|
||||
getTaetigkeiten(): Promise<Taetigkeit[]>;
|
||||
/**
|
||||
* Laedt eine Livesearch-Liste Seite fuer Seite. Die Seitenzahl steht in
|
||||
* `.pagination[data-pages]`; zusaetzlich bricht die Schleife ab, sobald eine
|
||||
* Seite keine neuen Zeilen bringt (Agrarmonitor ignoriert `seite` teils).
|
||||
*/
|
||||
private loadLivesearchSeiten;
|
||||
private vorherigeUeberschrift;
|
||||
/** Agrarmonitor zeigt leere Werte in Livesearch-Tabellen als "-" an. */
|
||||
private livesearchText;
|
||||
private createHttpClient;
|
||||
private createApiHttpClient;
|
||||
private apiRequest;
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"file":"AgrarmonitorConnector.d.ts","sourceRoot":"","sources":["../src/AgrarmonitorConnector.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"AgrarmonitorConnector.d.ts","sourceRoot":"","sources":["../src/AgrarmonitorConnector.ts"],"names":[],"mappings":"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"}
|
||||
Vendored
+101
@@ -11,6 +11,7 @@ const tough_cookie_1 = require("tough-cookie");
|
||||
class AgrarmonitorConnector {
|
||||
options;
|
||||
http;
|
||||
static maxLivesearchSeiten = 500;
|
||||
static s3DateienBaseUrl = 'https://s3-eu-central-1.amazonaws.com/dateien.agrarmonitor.de/07';
|
||||
baseUrl;
|
||||
apiBaseUrl;
|
||||
@@ -324,6 +325,38 @@ class AgrarmonitorConnector {
|
||||
};
|
||||
});
|
||||
}
|
||||
async getAlleMaschinen() {
|
||||
const documents = await this.loadLivesearchSeiten('/module/maschinen/livesearch.php', { suchstring: '', maschinen_aktiv: 1, maschinengruppe: 0 }, 'table.maschinen_table tbody tr[data-id]');
|
||||
const maschinen = new Map();
|
||||
for (const document of documents) {
|
||||
for (const table of Array.from(document.querySelectorAll('table.maschinen_table'))) {
|
||||
const gruppenId = this.parseNumber(table.id.replace('maschinen_table_', ''));
|
||||
const gruppe = this.vorherigeUeberschrift(table)?.textContent?.trim() ?? '';
|
||||
for (const row of Array.from(table.querySelectorAll('tbody tr[data-id]'))) {
|
||||
const id = this.parseNumber(row.getAttribute('data-id'));
|
||||
const vorhanden = maschinen.get(id);
|
||||
if (vorhanden) {
|
||||
if (!vorhanden.gruppenIds.includes(gruppenId)) {
|
||||
vorhanden.gruppenIds.push(gruppenId);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
const cells = Array.from(row.querySelectorAll('td'));
|
||||
maschinen.set(id, {
|
||||
id,
|
||||
nummer: this.livesearchText(cells[0]),
|
||||
name: this.livesearchText(cells[1]),
|
||||
kennzeichen: this.livesearchText(cells[2]),
|
||||
aktiv: Boolean(cells[4]?.querySelector('.fa-check, .text-green')),
|
||||
gruppenId,
|
||||
gruppe,
|
||||
gruppenIds: [gruppenId],
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return Array.from(maschinen.values());
|
||||
}
|
||||
async getFirmen() {
|
||||
const response = await this.http.get('/einstellungen');
|
||||
await this.saveSession();
|
||||
@@ -412,6 +445,74 @@ class AgrarmonitorConnector {
|
||||
};
|
||||
});
|
||||
}
|
||||
async getTaetigkeiten() {
|
||||
const documents = await this.loadLivesearchSeiten('/module/arbeitszeit/taetigkeiten-livesearch.php', { taetigkeiten_aktiv: 1 }, 'table.taetigkeit_table tbody tr[data-id]');
|
||||
const taetigkeiten = new Map();
|
||||
for (const document of documents) {
|
||||
for (const table of Array.from(document.querySelectorAll('table.taetigkeit_table'))) {
|
||||
const bereichElement = this.vorherigeUeberschrift(table)?.querySelector('.bereich');
|
||||
for (const row of Array.from(table.querySelectorAll('tbody tr[data-id]'))) {
|
||||
const id = this.parseNumber(row.getAttribute('data-id'));
|
||||
const cells = Array.from(row.querySelectorAll('td'));
|
||||
if (!id || taetigkeiten.has(id)) {
|
||||
continue;
|
||||
}
|
||||
taetigkeiten.set(id, {
|
||||
id,
|
||||
uuid: row.getAttribute('data-activityuuid') ?? '',
|
||||
nummer: cells[0]?.textContent?.trim() ?? '',
|
||||
name: cells[1]?.textContent?.trim() ?? '',
|
||||
aktiv: Boolean(row.querySelector('td.toggle .fa-check, td.toggle .text-green')),
|
||||
bereichId: this.parseNumber(bereichElement?.getAttribute('data-id')),
|
||||
bereich: bereichElement?.textContent?.trim() ?? '',
|
||||
maschineZuordnen: this.parseJaNein(cells[2]?.textContent ?? ''),
|
||||
abwesenheit: this.parseJaNein(cells[3]?.textContent ?? ''),
|
||||
notizErzwingen: this.parseJaNein(cells[5]?.textContent ?? ''),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return Array.from(taetigkeiten.values());
|
||||
}
|
||||
/**
|
||||
* Laedt eine Livesearch-Liste Seite fuer Seite. Die Seitenzahl steht in
|
||||
* `.pagination[data-pages]`; zusaetzlich bricht die Schleife ab, sobald eine
|
||||
* Seite keine neuen Zeilen bringt (Agrarmonitor ignoriert `seite` teils).
|
||||
*/
|
||||
async loadLivesearchSeiten(url, params, rowSelector) {
|
||||
const documents = [];
|
||||
const bekannteZeilen = new Set();
|
||||
for (let seite = 1; seite <= AgrarmonitorConnector.maxLivesearchSeiten; seite += 1) {
|
||||
const response = await this.http.get(url, { params: { ...params, seite } });
|
||||
await this.saveSession();
|
||||
const document = this.parseHtmlDocument(response.data);
|
||||
const neueZeilen = Array.from(document.querySelectorAll(rowSelector))
|
||||
.map(row => `${row.closest('table')?.id ?? ''}:${row.getAttribute('data-id') ?? row.id}`)
|
||||
.filter(key => !bekannteZeilen.has(key));
|
||||
if (neueZeilen.length === 0) {
|
||||
break;
|
||||
}
|
||||
neueZeilen.forEach(key => bekannteZeilen.add(key));
|
||||
documents.push(document);
|
||||
const seiten = this.parseNumber(document.querySelector('.pagination')?.getAttribute('data-pages'));
|
||||
if (seite >= seiten) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return documents;
|
||||
}
|
||||
vorherigeUeberschrift(element) {
|
||||
let sibling = element.previousElementSibling;
|
||||
while (sibling && !/^H[1-6]$/.test(sibling.tagName)) {
|
||||
sibling = sibling.previousElementSibling;
|
||||
}
|
||||
return sibling;
|
||||
}
|
||||
/** Agrarmonitor zeigt leere Werte in Livesearch-Tabellen als "-" an. */
|
||||
livesearchText(cell) {
|
||||
const text = cell?.textContent?.trim() ?? '';
|
||||
return text === '-' ? '' : text;
|
||||
}
|
||||
createHttpClient() {
|
||||
const client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({
|
||||
baseURL: this.baseUrl,
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"file":"AgrarmonitorConnector.js","sourceRoot":"","sources":["../src/AgrarmonitorConnector.ts"],"names":[],"mappings":"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 truncated
|
||||
{"version":3,"file":"AgrarmonitorConnector.js","sourceRoot":"","sources":["../src/AgrarmonitorConnector.ts"],"names":[],"mappings":"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 truncated
|
||||
Vendored
+23
@@ -50,11 +50,13 @@ export interface AgrarmonitorConnectorResult {
|
||||
getCustomerById(id: number): Promise<AgrarmonitorApiCustomer>;
|
||||
getMaschinenKategorien(): Promise<MaschinenKategorie[]>;
|
||||
getMaschinen(gruppenId: number, suchstring?: string): Promise<Maschine[]>;
|
||||
getAlleMaschinen(): Promise<MaschineMitGruppe[]>;
|
||||
getFirmen(): Promise<Firma[]>;
|
||||
getArtikelEinheiten(): Promise<ArtikelEinheit[]>;
|
||||
getArtikelKategorien(): Promise<ArtikelKategorie[]>;
|
||||
getArtikel(artikelGruppe: number, suchstring?: string): Promise<Artikel[]>;
|
||||
getMitarbeiter(suchstring?: string, mitarbeitergruppe?: number): Promise<Mitarbeiter[]>;
|
||||
getTaetigkeiten(): Promise<Taetigkeit[]>;
|
||||
}
|
||||
export interface AgrarmonitorFreischaltungStatus {
|
||||
freigeschaltet: boolean;
|
||||
@@ -152,6 +154,13 @@ export interface Maschine {
|
||||
kennzeichen: string;
|
||||
aktiv: boolean;
|
||||
}
|
||||
export interface MaschineMitGruppe extends Maschine {
|
||||
/** Erste Maschinenkategorie, in der die Maschine gelistet ist */
|
||||
gruppenId: number;
|
||||
gruppe: string;
|
||||
/** Alle Maschinenkategorien - eine Maschine kann in mehreren stehen */
|
||||
gruppenIds: number[];
|
||||
}
|
||||
export interface Firma {
|
||||
id: number;
|
||||
bezeichnung: string;
|
||||
@@ -177,4 +186,18 @@ export interface Mitarbeiter {
|
||||
vorname: string;
|
||||
aktiv: boolean;
|
||||
}
|
||||
export interface Taetigkeit {
|
||||
id: number;
|
||||
uuid: string;
|
||||
nummer: string;
|
||||
name: string;
|
||||
aktiv: boolean;
|
||||
bereichId: number;
|
||||
/** Ueberschrift des Bereichs, z. B. "100 Werkstatt (Mobil sichtbar)" */
|
||||
bereich: string;
|
||||
/** Spalte "Maschinen zuordnen" */
|
||||
maschineZuordnen: boolean;
|
||||
abwesenheit: boolean;
|
||||
notizErzwingen: boolean;
|
||||
}
|
||||
//# sourceMappingURL=types.d.ts.map
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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 truncated
|
||||
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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 truncated
|
||||
@@ -20,9 +20,11 @@ import type {
|
||||
Firma,
|
||||
Logger,
|
||||
Maschine,
|
||||
MaschineMitGruppe,
|
||||
MaschinenKategorie,
|
||||
Mitarbeiter,
|
||||
Rechnungsdaten,
|
||||
Taetigkeit,
|
||||
} from './types';
|
||||
|
||||
type RetryableAxiosRequestConfig = AxiosRequestConfig & {
|
||||
@@ -57,6 +59,7 @@ type AgrarmonitorCustomerPage = {
|
||||
export class AgrarmonitorConnector implements AgrarmonitorConnectorResult {
|
||||
public http!: AxiosInstance;
|
||||
|
||||
private static readonly maxLivesearchSeiten = 500;
|
||||
private static readonly s3DateienBaseUrl = 'https://s3-eu-central-1.amazonaws.com/dateien.agrarmonitor.de/07';
|
||||
|
||||
private readonly baseUrl: string;
|
||||
@@ -458,6 +461,49 @@ export class AgrarmonitorConnector implements AgrarmonitorConnectorResult {
|
||||
});
|
||||
}
|
||||
|
||||
async getAlleMaschinen(): Promise<MaschineMitGruppe[]> {
|
||||
const documents = await this.loadLivesearchSeiten(
|
||||
'/module/maschinen/livesearch.php',
|
||||
{ suchstring: '', maschinen_aktiv: 1, maschinengruppe: 0 },
|
||||
'table.maschinen_table tbody tr[data-id]'
|
||||
);
|
||||
const maschinen = new Map<number, MaschineMitGruppe>();
|
||||
|
||||
for (const document of documents) {
|
||||
for (const table of Array.from(document.querySelectorAll<HTMLTableElement>('table.maschinen_table'))) {
|
||||
const gruppenId = this.parseNumber(table.id.replace('maschinen_table_', ''));
|
||||
const gruppe = this.vorherigeUeberschrift(table)?.textContent?.trim() ?? '';
|
||||
|
||||
for (const row of Array.from(table.querySelectorAll<HTMLTableRowElement>('tbody tr[data-id]'))) {
|
||||
const id = this.parseNumber(row.getAttribute('data-id'));
|
||||
const vorhanden = maschinen.get(id);
|
||||
|
||||
if (vorhanden) {
|
||||
if (!vorhanden.gruppenIds.includes(gruppenId)) {
|
||||
vorhanden.gruppenIds.push(gruppenId);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
const cells = Array.from(row.querySelectorAll<HTMLTableCellElement>('td'));
|
||||
|
||||
maschinen.set(id, {
|
||||
id,
|
||||
nummer: this.livesearchText(cells[0]),
|
||||
name: this.livesearchText(cells[1]),
|
||||
kennzeichen: this.livesearchText(cells[2]),
|
||||
aktiv: Boolean(cells[4]?.querySelector('.fa-check, .text-green')),
|
||||
gruppenId,
|
||||
gruppe,
|
||||
gruppenIds: [gruppenId],
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return Array.from(maschinen.values());
|
||||
}
|
||||
|
||||
async getFirmen(): Promise<Firma[]> {
|
||||
const response = await this.http.get('/einstellungen');
|
||||
|
||||
@@ -575,6 +621,101 @@ export class AgrarmonitorConnector implements AgrarmonitorConnectorResult {
|
||||
});
|
||||
}
|
||||
|
||||
async getTaetigkeiten(): Promise<Taetigkeit[]> {
|
||||
const documents = await this.loadLivesearchSeiten(
|
||||
'/module/arbeitszeit/taetigkeiten-livesearch.php',
|
||||
{ taetigkeiten_aktiv: 1 },
|
||||
'table.taetigkeit_table tbody tr[data-id]'
|
||||
);
|
||||
const taetigkeiten = new Map<number, Taetigkeit>();
|
||||
|
||||
for (const document of documents) {
|
||||
for (const table of Array.from(document.querySelectorAll<HTMLTableElement>('table.taetigkeit_table'))) {
|
||||
const bereichElement = this.vorherigeUeberschrift(table)?.querySelector('.bereich');
|
||||
|
||||
for (const row of Array.from(table.querySelectorAll<HTMLTableRowElement>('tbody tr[data-id]'))) {
|
||||
const id = this.parseNumber(row.getAttribute('data-id'));
|
||||
const cells = Array.from(row.querySelectorAll<HTMLTableCellElement>('td'));
|
||||
|
||||
if (!id || taetigkeiten.has(id)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
taetigkeiten.set(id, {
|
||||
id,
|
||||
uuid: row.getAttribute('data-activityuuid') ?? '',
|
||||
nummer: cells[0]?.textContent?.trim() ?? '',
|
||||
name: cells[1]?.textContent?.trim() ?? '',
|
||||
aktiv: Boolean(row.querySelector('td.toggle .fa-check, td.toggle .text-green')),
|
||||
bereichId: this.parseNumber(bereichElement?.getAttribute('data-id')),
|
||||
bereich: bereichElement?.textContent?.trim() ?? '',
|
||||
maschineZuordnen: this.parseJaNein(cells[2]?.textContent ?? ''),
|
||||
abwesenheit: this.parseJaNein(cells[3]?.textContent ?? ''),
|
||||
notizErzwingen: this.parseJaNein(cells[5]?.textContent ?? ''),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return Array.from(taetigkeiten.values());
|
||||
}
|
||||
|
||||
/**
|
||||
* Laedt eine Livesearch-Liste Seite fuer Seite. Die Seitenzahl steht in
|
||||
* `.pagination[data-pages]`; zusaetzlich bricht die Schleife ab, sobald eine
|
||||
* Seite keine neuen Zeilen bringt (Agrarmonitor ignoriert `seite` teils).
|
||||
*/
|
||||
private async loadLivesearchSeiten(
|
||||
url: string,
|
||||
params: Record<string, string | number>,
|
||||
rowSelector: string
|
||||
): Promise<Document[]> {
|
||||
const documents: Document[] = [];
|
||||
const bekannteZeilen = new Set<string>();
|
||||
|
||||
for (let seite = 1; seite <= AgrarmonitorConnector.maxLivesearchSeiten; seite += 1) {
|
||||
const response = await this.http.get(url, { params: { ...params, seite } });
|
||||
|
||||
await this.saveSession();
|
||||
|
||||
const document = this.parseHtmlDocument(response.data);
|
||||
const neueZeilen = Array.from(document.querySelectorAll(rowSelector))
|
||||
.map(row => `${row.closest('table')?.id ?? ''}:${row.getAttribute('data-id') ?? row.id}`)
|
||||
.filter(key => !bekannteZeilen.has(key));
|
||||
|
||||
if (neueZeilen.length === 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
neueZeilen.forEach(key => bekannteZeilen.add(key));
|
||||
documents.push(document);
|
||||
|
||||
const seiten = this.parseNumber(document.querySelector('.pagination')?.getAttribute('data-pages'));
|
||||
|
||||
if (seite >= seiten) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return documents;
|
||||
}
|
||||
|
||||
private vorherigeUeberschrift(element: Element): Element | null {
|
||||
let sibling = element.previousElementSibling;
|
||||
|
||||
while (sibling && !/^H[1-6]$/.test(sibling.tagName)) {
|
||||
sibling = sibling.previousElementSibling;
|
||||
}
|
||||
|
||||
return sibling;
|
||||
}
|
||||
|
||||
/** Agrarmonitor zeigt leere Werte in Livesearch-Tabellen als "-" an. */
|
||||
private livesearchText(cell: HTMLTableCellElement | undefined): string {
|
||||
const text = cell?.textContent?.trim() ?? '';
|
||||
return text === '-' ? '' : text;
|
||||
}
|
||||
|
||||
private createHttpClient(): AxiosInstance {
|
||||
const client = wrapper(
|
||||
axios.create({
|
||||
|
||||
@@ -56,11 +56,13 @@ export interface AgrarmonitorConnectorResult {
|
||||
getCustomerById(id: number): Promise<AgrarmonitorApiCustomer>;
|
||||
getMaschinenKategorien(): Promise<MaschinenKategorie[]>;
|
||||
getMaschinen(gruppenId: number, suchstring?: string): Promise<Maschine[]>;
|
||||
getAlleMaschinen(): Promise<MaschineMitGruppe[]>;
|
||||
getFirmen(): Promise<Firma[]>;
|
||||
getArtikelEinheiten(): Promise<ArtikelEinheit[]>;
|
||||
getArtikelKategorien(): Promise<ArtikelKategorie[]>;
|
||||
getArtikel(artikelGruppe: number, suchstring?: string): Promise<Artikel[]>;
|
||||
getMitarbeiter(suchstring?: string, mitarbeitergruppe?: number): Promise<Mitarbeiter[]>;
|
||||
getTaetigkeiten(): Promise<Taetigkeit[]>;
|
||||
}
|
||||
|
||||
export interface AgrarmonitorFreischaltungStatus {
|
||||
@@ -170,6 +172,14 @@ export interface Maschine {
|
||||
aktiv: boolean;
|
||||
}
|
||||
|
||||
export interface MaschineMitGruppe extends Maschine {
|
||||
/** Erste Maschinenkategorie, in der die Maschine gelistet ist */
|
||||
gruppenId: number;
|
||||
gruppe: string;
|
||||
/** Alle Maschinenkategorien - eine Maschine kann in mehreren stehen */
|
||||
gruppenIds: number[];
|
||||
}
|
||||
|
||||
export interface Firma {
|
||||
id: number;
|
||||
bezeichnung: string;
|
||||
@@ -199,3 +209,18 @@ export interface Mitarbeiter {
|
||||
vorname: string;
|
||||
aktiv: boolean;
|
||||
}
|
||||
|
||||
export interface Taetigkeit {
|
||||
id: number;
|
||||
uuid: string;
|
||||
nummer: string;
|
||||
name: string;
|
||||
aktiv: boolean;
|
||||
bereichId: number;
|
||||
/** Ueberschrift des Bereichs, z. B. "100 Werkstatt (Mobil sichtbar)" */
|
||||
bereich: string;
|
||||
/** Spalte "Maschinen zuordnen" */
|
||||
maschineZuordnen: boolean;
|
||||
abwesenheit: boolean;
|
||||
notizErzwingen: boolean;
|
||||
}
|
||||
@@ -0,0 +1,303 @@
|
||||
const assert = require('node:assert/strict');
|
||||
const http = require('node:http');
|
||||
const test = require('node:test');
|
||||
|
||||
const { AgrarmonitorConnector, MemoryCookieStore } = require('../dist');
|
||||
|
||||
const loginPage = `
|
||||
<html>
|
||||
<head><title>Anmeldung - AGRARMONITOR</title></head>
|
||||
<body>
|
||||
<form>
|
||||
<input name="nonce" value="test-nonce" />
|
||||
<button>Einloggen</button>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
`;
|
||||
|
||||
const taetigkeitHead = `
|
||||
<thead><tr>
|
||||
<td class="breite-einheit">#</td><td width="24%">Bezeichnung</td><td width="13%">Maschinen zuordnen</td>
|
||||
<td width="12%">Abwesenheit</td><td width="12%">Als Urlaub werten</td><td width="13%">Notiz erzwingen</td>
|
||||
<td width="13%">Wartungsplan</td><td width="13%">Erweiterte Effizienz</td>
|
||||
<td class="breite-icon" data-sort-method="none" align="center">Aktiv</td>
|
||||
<td class="breite-icon" data-sort-method="none" align="center"> </td>
|
||||
</tr></thead>
|
||||
`;
|
||||
|
||||
// Gekuerzte Antwort von /module/arbeitszeit/taetigkeiten-livesearch.php?taetigkeiten_aktiv=1
|
||||
const taetigkeitenLivesearch = `
|
||||
<h2><b class="bereich" data-id="17">100 Werkstatt (Mobil sichtbar) </b></h2>
|
||||
<table width="100%" class="alternate sortable taetigkeit_table table-fixed">
|
||||
${taetigkeitHead}
|
||||
<tbody>
|
||||
<tr data-id="869" data-activityUUID="0191763e-2f7d-7c53-838d-f60b3c7bd0a6">
|
||||
<td>100</td><td>Reparatur / Wartung / Waschen etc. von Maschinen</td>
|
||||
<td>Ja</td><td>Nein</td><td>Nein</td><td>Ja</td><td>Ja</td><td>Nein</td>
|
||||
<td align="center" class="block toggle"><i class="fa fa-check text-green fa-lg"></i></td>
|
||||
<td align="center" class="block"></td>
|
||||
</tr>
|
||||
<tr data-id="15" data-activityUUID="0191763e-2cae-7d34-98d6-ec160935ae42">
|
||||
<td>110</td><td>Wartung</td>
|
||||
<td>Ja</td><td>Nein</td><td>Nein</td><td>Nein</td><td>Ja</td><td>Nein</td>
|
||||
<td align="center" class="block toggle"><i class="fa fa-close text-red fa-lg"></i></td>
|
||||
<td align="center" class="block"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<br />
|
||||
<h2><b class="bereich" data-id="19">900 Abwesenheit (Mobil nicht sichtbar) </b></h2>
|
||||
<table width="100%" class="alternate sortable taetigkeit_table table-fixed">
|
||||
${taetigkeitHead}
|
||||
<tbody>
|
||||
<tr data-id="819" data-activityUUID="0191763e-2f3c-7766-be96-4bf6933e5677">
|
||||
<td>950</td><td>Feiertag</td>
|
||||
<td>Nein</td><td>Ja</td><td>Nein</td><td>Nein</td><td>Nein</td><td>Nein</td>
|
||||
<td align="center" class="block toggle"><i class="fa fa-check text-green fa-lg"></i></td>
|
||||
<td align="center" class="block"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<script>admin.Arbeitszeit.Arbeitszeit.taetigkeitenLivesearch("de-DE", {"taetigkeiten":1});</script>
|
||||
`;
|
||||
|
||||
function maschinenTabelle(gruppenId, gruppe, rows) {
|
||||
return `
|
||||
<h2>${gruppe}</h2>
|
||||
<table width="100%" class="sortable clickable alternate maschinen_table table-fixed" id="maschinen_table_${gruppenId}">
|
||||
<thead><tr>
|
||||
<td width="10%">#</td><td width="50%">Bezeichnung</td><td width="15%">Kennzeichen</td><td width="25%">Zähler</td>
|
||||
<td align="center" class="breite-50" data-sort-method="none">Aktiv</td>
|
||||
<td align="center" class="block breite-icon" data-sort-method="none"><input type="checkbox" class="checkall"></td>
|
||||
</tr></thead>
|
||||
<tbody>${rows}</tbody>
|
||||
</table>
|
||||
`;
|
||||
}
|
||||
|
||||
function maschinenZeile(id, nummer, name, kennzeichen, aktiv) {
|
||||
return `
|
||||
<tr id="${id}" data-id="${id}">
|
||||
<td>${nummer}</td><td> ${name} </td><td>${kennzeichen}</td><td>-</td>
|
||||
<td align="center" class="block toggle"><i class="fa ${aktiv ? 'fa-check text-green' : 'fa-close text-red'} fa-lg"></i></td>
|
||||
<td align="center" class="block"><input type="checkbox" name="maschinen[]" value="${id}"></td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
|
||||
const pagination = seiten => `<div class="pagination" data-firma="" data-pages="${seiten}"></div>`;
|
||||
|
||||
// Seite 1: eine Maschine steht in zwei Kategorien, Seite 2: weitere Maschine.
|
||||
const maschinenSeite1 =
|
||||
maschinenTabelle(
|
||||
7,
|
||||
'Schlepper',
|
||||
maschinenZeile(5033, '12', 'Testschlepper 724', 'XX-AB 724', true) +
|
||||
maschinenZeile(3696, '-', 'Einrichtung', '-', false)
|
||||
) +
|
||||
maschinenTabelle(893, 'Zugmaschinen GmbH', maschinenZeile(5033, '12', 'Testschlepper 724', 'XX-AB 724', true));
|
||||
const maschinenSeite2 = maschinenTabelle(13, 'LKWs', maschinenZeile(7087, '40', 'Test-LKW', 'XX-CD 40', true));
|
||||
|
||||
function createServer({ maschinenSeiten }) {
|
||||
const requests = [];
|
||||
let loggedIn = false;
|
||||
|
||||
const server = http.createServer((req, res) => {
|
||||
const url = new URL(req.url, 'http://localhost');
|
||||
requests.push({ method: req.method, path: url.pathname, params: Object.fromEntries(url.searchParams) });
|
||||
|
||||
if (req.method === 'POST' && url.pathname === '/login/api/login.php') {
|
||||
req.resume();
|
||||
req.on('end', () => {
|
||||
loggedIn = true;
|
||||
res.writeHead(200, { 'Content-Type': 'application/json', 'Set-Cookie': 'agrar_session=test; Path=/' });
|
||||
res.end(JSON.stringify({ success: true }));
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
||||
|
||||
if (!loggedIn) {
|
||||
res.end(loginPage);
|
||||
return;
|
||||
}
|
||||
|
||||
if (url.pathname === '/') {
|
||||
res.end('<html><body>Mein AM</body></html>');
|
||||
return;
|
||||
}
|
||||
|
||||
if (url.pathname === '/module/arbeitszeit/taetigkeiten-livesearch.php') {
|
||||
// Agrarmonitor ignoriert "seite" hier und liefert immer alles.
|
||||
res.end(taetigkeitenLivesearch);
|
||||
return;
|
||||
}
|
||||
|
||||
if (url.pathname === '/module/maschinen/livesearch.php') {
|
||||
const seite = Number(url.searchParams.get('seite'));
|
||||
res.end(maschinenSeiten(seite));
|
||||
return;
|
||||
}
|
||||
|
||||
res.writeHead(404);
|
||||
res.end('not found');
|
||||
});
|
||||
|
||||
return {
|
||||
server,
|
||||
requests,
|
||||
expireSession() {
|
||||
loggedIn = false;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
async function startConnector(t, serverOptions = { maschinenSeiten: () => maschinenSeite1 + pagination(0) }) {
|
||||
const { server, requests, expireSession } = createServer(serverOptions);
|
||||
|
||||
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
|
||||
t.after(() => new Promise(resolve => server.close(resolve)));
|
||||
|
||||
const connector = new AgrarmonitorConnector({
|
||||
baseUrl: `http://127.0.0.1:${server.address().port}`,
|
||||
username: 'demo',
|
||||
password: 'secret',
|
||||
cookieStore: new MemoryCookieStore(),
|
||||
});
|
||||
|
||||
await connector.init();
|
||||
|
||||
return { connector, requests, expireSession };
|
||||
}
|
||||
|
||||
const livesearchRequests = (requests, path) => requests.filter(request => request.path === path);
|
||||
|
||||
test('getTaetigkeiten liest aktive und inaktive Taetigkeiten mit Bereich', async t => {
|
||||
const { connector, requests } = await startConnector(t);
|
||||
|
||||
const taetigkeiten = await connector.getTaetigkeiten();
|
||||
|
||||
assert.deepEqual(taetigkeiten, [
|
||||
{
|
||||
id: 869,
|
||||
uuid: '0191763e-2f7d-7c53-838d-f60b3c7bd0a6',
|
||||
nummer: '100',
|
||||
name: 'Reparatur / Wartung / Waschen etc. von Maschinen',
|
||||
aktiv: true,
|
||||
bereichId: 17,
|
||||
bereich: '100 Werkstatt (Mobil sichtbar)',
|
||||
maschineZuordnen: true,
|
||||
abwesenheit: false,
|
||||
notizErzwingen: true,
|
||||
},
|
||||
{
|
||||
id: 15,
|
||||
uuid: '0191763e-2cae-7d34-98d6-ec160935ae42',
|
||||
nummer: '110',
|
||||
name: 'Wartung',
|
||||
aktiv: false,
|
||||
bereichId: 17,
|
||||
bereich: '100 Werkstatt (Mobil sichtbar)',
|
||||
maschineZuordnen: true,
|
||||
abwesenheit: false,
|
||||
notizErzwingen: false,
|
||||
},
|
||||
{
|
||||
id: 819,
|
||||
uuid: '0191763e-2f3c-7766-be96-4bf6933e5677',
|
||||
nummer: '950',
|
||||
name: 'Feiertag',
|
||||
aktiv: true,
|
||||
bereichId: 19,
|
||||
bereich: '900 Abwesenheit (Mobil nicht sichtbar)',
|
||||
maschineZuordnen: false,
|
||||
abwesenheit: true,
|
||||
notizErzwingen: false,
|
||||
},
|
||||
]);
|
||||
|
||||
const calls = livesearchRequests(requests, '/module/arbeitszeit/taetigkeiten-livesearch.php');
|
||||
assert.equal(calls.length, 1, 'ohne Pagination nur eine Seite laden');
|
||||
assert.deepEqual(calls[0].params, { taetigkeiten_aktiv: '1', seite: '1' });
|
||||
});
|
||||
|
||||
test('getAlleMaschinen laedt alle Seiten und fasst Maschinen aus mehreren Kategorien zusammen', async t => {
|
||||
const { connector, requests } = await startConnector(t, {
|
||||
maschinenSeiten: seite => (seite === 1 ? maschinenSeite1 : maschinenSeite2) + pagination(2),
|
||||
});
|
||||
|
||||
const maschinen = await connector.getAlleMaschinen();
|
||||
|
||||
assert.deepEqual(maschinen, [
|
||||
{
|
||||
id: 5033,
|
||||
nummer: '12',
|
||||
name: 'Testschlepper 724',
|
||||
kennzeichen: 'XX-AB 724',
|
||||
aktiv: true,
|
||||
gruppenId: 7,
|
||||
gruppe: 'Schlepper',
|
||||
gruppenIds: [7, 893],
|
||||
},
|
||||
{
|
||||
id: 3696,
|
||||
nummer: '',
|
||||
name: 'Einrichtung',
|
||||
kennzeichen: '',
|
||||
aktiv: false,
|
||||
gruppenId: 7,
|
||||
gruppe: 'Schlepper',
|
||||
gruppenIds: [7],
|
||||
},
|
||||
{
|
||||
id: 7087,
|
||||
nummer: '40',
|
||||
name: 'Test-LKW',
|
||||
kennzeichen: 'XX-CD 40',
|
||||
aktiv: true,
|
||||
gruppenId: 13,
|
||||
gruppe: 'LKWs',
|
||||
gruppenIds: [13],
|
||||
},
|
||||
]);
|
||||
|
||||
const calls = livesearchRequests(requests, '/module/maschinen/livesearch.php');
|
||||
assert.deepEqual(
|
||||
calls.map(call => call.params),
|
||||
[
|
||||
{ suchstring: '', maschinen_aktiv: '1', maschinengruppe: '0', seite: '1' },
|
||||
{ suchstring: '', maschinen_aktiv: '1', maschinengruppe: '0', seite: '2' },
|
||||
]
|
||||
);
|
||||
});
|
||||
|
||||
test('getAlleMaschinen bricht ab, wenn eine Seite keine neuen Zeilen bringt', async t => {
|
||||
// data-pages behauptet 5 Seiten, ab Seite 2 kommt immer dasselbe.
|
||||
const { connector, requests } = await startConnector(t, {
|
||||
maschinenSeiten: seite => (seite === 1 ? maschinenSeite1 : maschinenSeite2) + pagination(5),
|
||||
});
|
||||
|
||||
const maschinen = await connector.getAlleMaschinen();
|
||||
|
||||
assert.deepEqual(
|
||||
maschinen.map(maschine => maschine.id),
|
||||
[5033, 3696, 7087]
|
||||
);
|
||||
assert.equal(livesearchRequests(requests, '/module/maschinen/livesearch.php').length, 3);
|
||||
});
|
||||
|
||||
test('getTaetigkeiten meldet sich bei abgelaufener Session neu an', async t => {
|
||||
const { connector, requests, expireSession } = await startConnector(t);
|
||||
const logins = () => requests.filter(request => request.path === '/login/api/login.php').length;
|
||||
|
||||
assert.equal(logins(), 1, 'init soll genau einmal einloggen');
|
||||
expireSession();
|
||||
|
||||
const taetigkeiten = await connector.getTaetigkeiten();
|
||||
|
||||
assert.equal(taetigkeiten.length, 3);
|
||||
assert.equal(logins(), 2, 'abgelaufene Session soll genau einen erneuten Login ausloesen');
|
||||
assert.equal(livesearchRequests(requests, '/module/arbeitszeit/taetigkeiten-livesearch.php').length, 2);
|
||||
});
|
||||
Reference in new issue
Block a user