Skip to content

Commit beeccae

Browse files
lanketlanket
committed
Добавил выбор объекта и метода с отправкой терминалу.
Те у кого будет ругаться на отсутствующее поле в таблице: require(DIR_MODULES.'mdmPiTerminal/mdmPiTerminal.class.php'); $mpt = new mdmPiTerminal(); $mpt->dbInstall();
1 parent c7e3c60 commit beeccae

4 files changed

Lines changed: 53 additions & 37 deletions

File tree

‎modules/mdmPiTerminal/mdmPiTerminal.class.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ function addObject($nmTerm) {
254254
//global $create_class;
255255
if($this->debug == 1) debmes('mpt addObject create class : ' . $this->config['CREATE_CLASS']);
256256
if($this->debug == 1) debmes('mpt addObject nmTerm : ' . $nmTerm);
257-
if ($this->config['CREATE_CLASS'] <> 1) return;
258257
if($this->debug == 1) debmes('mpt addObject after return ' . $nmTerm);
259258
addClass('Terminals');
260259
$phpcode = <<<EOD
@@ -329,7 +328,7 @@ function dbInstall($data) {
329328
mpt: SETTINGS_SENSITIVITY varchar(3) NOT NULL DEFAULT '0.7'
330329
mpt: SETTINGS_PROVIDERTTS varchar(20) NOT NULL DEFAULT 'google'
331330
mpt: SETTINGS_PROVIDERSTT varchar(20) NOT NULL DEFAULT 'google'
332-
mpt: MAJORDOMO_HEARTBEAT_TIMEOUT INT(4) NOT NULL DEFAULT '0'
331+
mpt: MAJORDOMO_HEARTBEAT_TIMEOUT INT(4) NOT NULL DEFAULT 0
333332
mpt: MPD_CONTROL BOOLEAN NOT NULL DEFAULT TRUE
334333
mpt: MPD_IP varchar(15) NOT NULL DEFAULT '127.0.0.1'
335334
mpt: MPD_PORT varchar(5) NOT NULL DEFAULT '6600'
@@ -364,6 +363,7 @@ function dbInstall($data) {
364363
mpt: UPDATE_PIP BOOLEAN NOT NULL DEFAULT TRUE
365364
mpt: UPDATE_APT BOOLEAN NOT NULL DEFAULT FALSE
366365
mpt: MAJORDOMO_OBJECT_METHOD varchar(100) NOT NULL DEFAULT ''
366+
mpt: MAJORDOMO_OBJECT_NAME varchar(100) NOT NULL DEFAULT ''
367367
EOD;
368368
parent::dbInstall($data);
369369
}
@@ -389,7 +389,7 @@ function validate($param)
389389
mpt: SETTINGS_SENSITIVITY varchar(3) NOT NULL DEFAULT '0.7'
390390
mpt: SETTINGS_PROVIDERTTS varchar(20) NOT NULL DEFAULT 'google'
391391
mpt: SETTINGS_PROVIDERSTT varchar(20) NOT NULL DEFAULT 'google'
392-
mpt: MAJORDOMO_HEARTBEAT_TIMEOUT INT(4) NOT NULL DEFAULT '0'
392+
mpt: MAJORDOMO_HEARTBEAT_TIMEOUT INT(4) NOT NULL DEFAULT 0
393393
mpt: MPD_CONTROL BOOLEAN NOT NULL DEFAULT TRUE
394394
mpt: MPD_IP varchar(15) NOT NULL DEFAULT '127.0.0.1'
395395
mpt: MPD_PORT varchar(5) NOT NULL DEFAULT '6600'
@@ -424,6 +424,7 @@ function validate($param)
424424
mpt: UPDATE_PIP BOOLEAN NOT NULL DEFAULT TRUE
425425
mpt: UPDATE_APT BOOLEAN NOT NULL DEFAULT FALSE
426426
mpt: MAJORDOMO_OBJECT_METHOD varchar(100) NOT NULL DEFAULT ''
427+
mpt: MAJORDOMO_OBJECT_NAME varchar(100) NOT NULL DEFAULT ''
427428
EOD;
428429
$data = explode("\n", $db);
429430
//$data = explode("\n", $db);

‎modules/mdmPiTerminal/mpt_edit.inc.php‎

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,11 @@
2121
$out['ERR_ID_TERMINAL']=1;
2222
$ok=0;
2323
}
24-
//updating '<%LANG_TITLE%>' (varchar, required)
25-
/*
26-
global $title;
27-
$rec['TITLE']=$title;
28-
if ($rec['TITLE']=='') {
29-
$out['ERR_TITLE']=1;
30-
$ok=0;
31-
}
32-
//updating 'name' (varchar)
33-
global $name;
34-
$rec['NAME']=$name;
35-
//updating 'linkedRoom' (varchar)
36-
global $linkedroom;
37-
$rec['LINKEDROOM']=$linkedroom;
38-
//updating 'ip' (varchar)
39-
global $ip;
40-
$rec['IP']=$ip;
41-
*/
42-
if($_POST['panel_voice'])
24+
else
25+
26+
27+
28+
if($_POST['panel_voice'])
4329
{
4430
//updating 'snowboy_token' (varchar)
4531
$rec['SNOWBOY_TOKEN']= $this->validate('snowboy_token');
@@ -102,17 +88,14 @@
10288
$rec['SETTINGS_CHROME_CHOKE']= $this->validate('settings_chrome_choke');
10389
//updating 'settings_chrome_alarmstt' (BOOLEAN)
10490
$rec['SETTINGS_CHROME_ALARMSTT']= $this->validate('settings_chrome_alarmstt');
91+
//updating 'majordomo_object_name' (varchar)
92+
$rec['MAJORDOMO_OBJECT_NAME']= $this->validate('majordomo_object_name');
93+
//updating 'majordomo_object_method' (varchar)
94+
$rec['MAJORDOMO_OBJECT_METHOD']= $this->validate('majordomo_object_method');
95+
//updating 'majordomo_heartbeat_timeout' (varchar)
96+
$rec['MAJORDOMO_HEARTBEAT_TIMEOUT']= $this->validate('majordomo_heartbeat_timeout');
10597
}
106-
/*
107-
//updating '<%LANG_LINKED_OBJECT%>' (varchar)
108-
global $linked_object;
109-
$rec['LINKED_OBJECT']=$linked_object;
110-
//updating '<%LANG_LINKED_PROPERTY%>' (varchar)
111-
global $linked_property;
112-
$rec['LINKED_PROPERTY']=$linked_property;
113-
114-
*/
115-
//UPDATING RECORD
98+
11699
if($this->debug == 1) debmes('mpt edit befour ok');
117100
if ($ok) {
118101
if($this->debug == 1) debmes('mpt edit after ok');
@@ -124,15 +107,20 @@
124107
} else {
125108
if($this->debug == 1) debmes('mpt edit no recid insert');
126109
$new_rec=1;
110+
$nmTerm = $tmp['NAME'];
111+
if($this->debug == 1) debmes('mpt edit add object: ' . $nmTerm);
112+
if ($this->config['CREATE_CLASS'] == 1)
113+
{
114+
$this->addObject($nmTerm);
115+
$rec['MAJORDOMO_OBJECT_METHOD'] = 'TerminalDataProcessing';
116+
$rec['MAJORDOMO_OBJECT_NAME'] = $nmTerm;
117+
}
127118
$rec['ID']=SQLInsert($table_name, $rec); // adding new record
128119
}
129120
$rec['IP_SERVER']=$_SERVER['SERVER_ADDR'];
130-
//$senddata = json_encode($rec);
131-
$this->send_mpt('settings',$rec,$tmp['HOST']);
132121
if($this->debug == 1) debmes('mpt edit send: ' . $senddata);
133-
$nmTerm = $tmp['NAME'];
134-
if($this->debug == 1) debmes('mpt edit add object: ' . $nmTerm);
135-
$this->addObject($nmTerm);
122+
123+
$this->send_mpt('settings',$rec,$tmp['HOST']);
136124
$out['OK']=1;
137125
} else {
138126
$out['ERR']=1;

‎templates/mdmPiTerminal/action_admin.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!-- table zwave_devices search -->
22
<div>
33
[ <a href="#" onClick="$('#create_class_set').toggle();return false;"><#LANG_SETUP#></a> ]
4+
[ <a href="/admin.php?pd=&md=panel&inst=&action=mdmPiTerminal" onclick="return partLoad(this.href);"> Список терминалов</a> ]
45
</div>
56
<div style="display:none" id='create_class_set'>
67
&nbsp;

‎templates/mdmPiTerminal/mpt_edit.html‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,32 @@
179179
<input type="checkbox" name="settings_chrome_alarmstt" value="1"[#if SETTINGS_CHROME_ALARMSTT="1"#] checked[#endif#]>
180180
</div>
181181
</div>
182+
183+
<!-- MAJORDOMO_OBJECT_NAME (varchar) LINKED_OBJECT -->
184+
<div class="form-group[#if ERR_MAJORDOMO_OBJECT_NAME#] has-error[#endif#]">
185+
<label for="majordomo_object_name" class="col-lg-3 control-label">
186+
<#LANG_LINKED_OBJECT#>:
187+
</label>
188+
<div class="col-lg-9"><input id="majordomo_object_name" name="majordomo_object_name" value="[#MAJORDOMO_OBJECT_NAME#]" type="text" class="form-control"[#if CREATE_CLASS="1"#] disabled[#endif#]></div>
189+
</div>
190+
<!-- MAJORDOMO_OBJECT_METHOD (varchar) LINKED_METHOD -->
191+
<div class="form-group[#if ERR_MAJORDOMO_OBJECT_METHOD#] has-error[#endif#]">
192+
<label for="majordomo_object_method" class="col-lg-3 control-label">
193+
<#LANG_METHOD#>:
194+
</label>
195+
<div class="col-lg-9"><input id="majordomo_object_method" name="majordomo_object_method" value="[#MAJORDOMO_OBJECT_METHOD#]" type="text" class="form-control"[#if CREATE_CLASS="1"#] disabled[#endif#]></div>
196+
</div>
197+
[#if CREATE_CLASS<>"1"#]
198+
[#module name="linkedobject" object_field="majordomo_object_name" method_field="majordomo_object_method"#]
199+
[#endif#]
200+
<!-- MAJORDOMO_HEARTBEAT_TIMEOUT (varchar) -->
201+
<div class="form-group[#if ERR_MAJORDOMO_HEARTBEAT_TIMEOUT#] has-error[#endif#]">
202+
<label for="majordomo_heartbeat_timeout" class="col-lg-3 control-label">
203+
Контроль работоспособности в сек <img src="/img/helpicon.png" title="Если объект и метод заданы, будет отправлять запросы при неактивности терминала, интервал задается в секундах, параметр status отсутствует. 0 - отключено."/>
204+
</label>
205+
<div class="col-lg-9"><input id="majordomo_heartbeat_timeout" name="majordomo_heartbeat_timeout" value="[#MAJORDOMO_HEARTBEAT_TIMEOUT#]" type="text" class="form-control"></div>
206+
</div>
207+
182208
<input type="hidden" name="view_mode" value="<#VIEW_MODE#>">
183209
<input type="hidden" name="edit_mode" value="<#EDIT_MODE#>">
184210
<input type="hidden" name="mode" value="update">

0 commit comments

Comments
 (0)