Timemanger immer anzeigen, TAPI Suche nur wenn mehr als 3 Ziffern bei Nummer

This commit is contained in:
Daniel Triendl
2020-12-09 10:54:13 +01:00
parent 29fc426161
commit fec9885a64
4 changed files with 22 additions and 20 deletions

View File

@ -6,11 +6,10 @@ export class CallHistory {
private callerIds: { [number: string]: TapiContact } = {}
private updateCallHistoryEntry (call: HTMLElement, callerId: TapiContact) {
if (callerId.tD_NAME !== '') {
var span = call.querySelector('span')
this.showTimeManager(call, span.nextSibling.textContent.trim(), callerId)
var span = call.querySelector('span')
this.showTimeManager(call, span.nextSibling.textContent.trim(), callerId)
if (callerId && callerId.tD_NAME !== '') {
var text = span.textContent
span.textContent = callerId.tD_NAME
var br = document.createElement('br')
@ -23,10 +22,6 @@ export class CallHistory {
}
private showTimeManager (call: HTMLElement, date: string, callerId: TapiContact) {
if (!callerId.tD_ID) {
return
}
var dateParts = date.match(/^(?<date>.*), (?<duration>[0-9]{2}:[0-9]{2}:[0-9]{2})$/)
var duration = '00:00:00'
if (dateParts) {
@ -56,7 +51,11 @@ export class CallHistory {
var length = (parsedDuration.getHours() * 60 + parsedDuration.getMinutes()).toString()
var toolbar = call.querySelector('.wcToolbarTiles')
var href = 'domizil://PM/Zeitbuchung?KontaktId=' + callerId.tD_ID + '&connect=' + connect + '&length=' + length
var href = 'domizil://PM/Zeitbuchung?'
if (callerId && callerId.tD_ID) {
href += 'KontaktId=' + callerId.tD_ID + '&'
}
href += 'connect=' + connect + '&length=' + length
var a = document.createElement('a')
a.title = 'PM Zeitbuchung'
a.dataset.domizilLink = href
@ -82,6 +81,7 @@ export class CallHistory {
var span = element.querySelector('span')
var number = extractNumber(span.textContent)
if (!number) {
this.updateCallHistoryEntry(element, undefined)
return
}

View File

@ -19,7 +19,7 @@ axios.defaults.adapter = adapter
export { axios }
export function extractNumber (s: string) {
var match = /(\+?[0-9]+)/.exec(s)
var match = /(\+?[0-9]{4,})/.exec(s)
if (!match) {
return undefined
}