Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nummern aus der Visu de/aktivieren #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Nummern aus der Visu de/aktivieren #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca3ecf0
add Idents and create variables
Sunnyka98 Aug 19, 2024
9abf51f
Add test for the feature
Sunnyka98 Aug 19, 2024
797ce87
Refactor to use buffer
Sunnyka98 Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions PhoneChain/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,25 @@
}
]
},
{
"type": "CheckBox",
"caption": "Editable at Visualization",
"name": "EditableVisu"
},
{
"type": "List",
"name": "PhoneNumbers",
"caption": "Phone Numbers",
"add": true,
"delete": true,
"columns": [
{
"name": "VariableIdent",
"width": "0px",
"add": "",
"caption": "VariableIdent",
"visible": false
},
{
"name": "PhoneNumber",
"caption": "Phone Number",
Expand Down
90 changes: 88 additions & 2 deletions PhoneChain/module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public function Create()
$this->RegisterPropertyString('TTSType', 'Static');
$this->RegisterPropertyString('TTSStaticText', '');
$this->RegisterPropertyInteger('TTSDynamicVariable', 0);
$this->RegisterPropertyBoolean('EditableVisu', false);
$this->RegisterPropertyString('PhoneNumbers', '[]');
$this->RegisterPropertyInteger('MaxSyncCallCount', 2);
$this->RegisterPropertyInteger('CallDuration', 15);
Expand Down Expand Up @@ -67,6 +68,47 @@ public function ApplyChanges()
$this->SetBuffer('ActiveCalls', '[]');
$this->SetBuffer('ListPosition', '0');

//Create the variables if the feature is true
if ($this->ReadPropertyBoolean('EditableVisu')) {
$needsReload = false;
$phoneNumbers = json_decode($this->ReadPropertyString('PhoneNumbers'), true);
//Create the variable
foreach ($phoneNumbers as $key => $number) {
$ident = array_key_exists('VariableIdent', $number) ? $number['VariableIdent'] : 'PhoneNumber_' . $key;
if (!@$this->GetIDForIdent($ident)) {
$this->MaintainVariable($ident, array_key_exists('Description', $number) && $number['Description'] !== '' ? $number['Description'] : 'Phone Number' . $key + 1, 0, '', $key, true);
$this->EnableAction($ident);
$id = $this->GetIDForIdent($ident);
$this->RegisterReference($id);
$this->RegisterMessage($id, OM_CHANGEDISABLED);
$needsReload = true;
}
$phoneNumbers[$key]['VariableIdent'] = $ident;
}
if ($needsReload) {
IPS_SetProperty($this->InstanceID, 'PhoneNumbers', json_encode($phoneNumbers));
IPS_ApplyChanges($this->InstanceID);
return;
}

//Delete unnecessary variables
$idents = array_column($phoneNumbers, 'VariableIdent');
array_push(
$idents,
'ConfirmNumber',
'Status',
'ResetStatus',
);
foreach (IPS_GetChildrenIDs($this->InstanceID) as $childID) {
if (!in_array($this->GetIdentByID($childID), $idents)) {
$this->UnregisterReference($childID);
$this->UnregisterMessage($childID, OM_CHANGEDISABLED);
$this->UnregisterVariable($this->GetIdentByID($childID));
}
}
}
$this->updateBuffer();

$this->setErrorState();
if ($this->GetStatus() != 102) {
return;
Expand All @@ -91,11 +133,11 @@ public function MessageSink($TimeStamp, $SenderID, $MessageID, $Data)
switch ($MessageID) {
case VM_UPDATE:
if ($Data[0] && ($this->GetStatus() == 102) && ($this->GetValue('Status') == self::WAITING)) {
$this->updateBuffer();
$this->SetTimerInterval('UpdateCall', 1000);
$this->UpdateCalls();
}
break;

case self::VOIP_EVENT:
//Only handle messages for our active calls
if (!array_key_exists($Data[0], json_decode($this->GetBuffer('ActiveCalls'), true))) {
Expand Down Expand Up @@ -144,6 +186,21 @@ public function MessageSink($TimeStamp, $SenderID, $MessageID, $Data)
}
}

public function RequestAction($Ident, $Value)
{

if (in_array($Ident, ['Status', 'ConfirmNumber', 'ResetStatus'])) {
return;
}

if ($this->GetValue('Status') > 0) {
echo $this->Translate('Phone Chain is not ready, no changes possible');
return;
}
$this->SetValue($Ident, $Value);

}

public function UISetVisible(string $ttsType)
{
$this->UpdateFormField('TTSStaticText', 'visible', $ttsType == 'Static');
Expand Down Expand Up @@ -177,8 +234,9 @@ public function UpdateCalls()
}

//If maxSyncCalls not reached and not at the end of the number list
$phoneNumbers = json_decode($this->ReadPropertyString('PhoneNumbers'), true);
$phoneNumbers = json_decode($this->GetBuffer('CurrentChain'), true);
$listPosition = json_decode($this->GetBuffer('ListPosition'));

if ((count($activeCalls) < $this->ReadPropertyInteger('MaxSyncCallCount')) && ($listPosition < count($phoneNumbers))) {
$call = VoIP_Connect($this->ReadPropertyInteger('VoIP'), $phoneNumbers[$listPosition]['PhoneNumber']);
$this->SetValue('Status', $listPosition + 1);
Expand Down Expand Up @@ -211,6 +269,7 @@ public function GetConfigurationForm()
$form['elements'][9]['visible'] = $this->ReadPropertyBoolean('ResetStatus');
$form['elements'][3]['items'][1]['visible'] = $this->ReadPropertyString('TTSType') == 'Static';
$form['elements'][3]['items'][2]['visible'] = $this->ReadPropertyString('TTSType') == 'Dynamic';

return json_encode($form);
}

Expand Down Expand Up @@ -294,4 +353,31 @@ private function reset()
$this->SetBuffer('ListPosition', '0');
$this->SetBuffer('ActiveCalls', '[]');
}

private function GetIdentByID(int $id): string
{
return IPS_GetObject($id)['ObjectIdent'];
}

private function updateBuffer(): void
{
$chain = [];
$newPosition = 0;
$numbers = json_decode($this->ReadPropertyString('PhoneNumbers'), true);
if (!$this->ReadPropertyBoolean('EditableVisu')) {
$this->setBuffer('CurrentChain', json_encode($numbers));
return;
}
foreach ($numbers as $position => $number) {

$ident = array_key_exists('VariableIdent', $number) ? $number['VariableIdent'] : 'PhoneNumber_' . $position;
$id = $this->GetIDForIdent($ident);
if (!IPS_GetObject($id)['ObjectIsDisabled'] && $this->GetValue($ident)) {
$chain[$newPosition] = $number;
$newPosition++;
}

}
$this->SetBuffer('CurrentChain', json_encode($chain));
}
}
Loading