Alarm24
/
A24_Patriot_API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Alarm24:f254e4028c6687db239aebd1fa05ab107813b414
Branches Tags
Alarm24:main
..
compare: Alarm24:2b0972a22cbaffd3c03211a2ab901d49f9915c41
Branches Tags
Alarm24:main

No commits in common. "f254e4028c6687db239aebd1fa05ab107813b414" and "2b0972a22cbaffd3c03211a2ab901d49f9915c41" have entirely different histories.
f254e4028c ... 2b0972a22c

2 changed files with 8 additions and 11 deletions
Show Stats Expand all files Collapse all files

16
Patriot API.postman_collection.json
View File

@ -151,7 +151,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"info\": {\n \"Name\": \"Anders Knutsen\",\n \"Alias\": \"000FD267\",\n \"Location\": \"Lislebyveien 58\",\n \"area_code\": \"1604\",\n \"area\": \"Fredrikstad\",\n \"BusPhone\": \"69310000\",\n \"Email\": \"post@ostsik.no\",\n \"OKPassword\": \"franzjager\",\n \"SpecRequest\": \"Dette skal gjøres ved alarm på denne kunden.\",\n \"NoSigsMon\": \"1\",\n \"SinceDays\": 1,\n \"SinceHrs\": 0,\n \"SinceMins\": 30,\n \"ResetNosigsIgnored\": true,\n \"ResetNosigsDays\": 7,\n \"ResetNosigsHrs\": 0,\n \"ResetNosigsMins\": 0,\n \"InstallDateTime\": \"2023-02-20\",\n \"PanelName\": \"Futurehome\",\n \"PanelSite\": \"Stue\",\n \"KeypadLocation\": \"Inngang\",\n \"SPPage\": \"Ekstra informasjon som kan være relevant.\"\n }\n}",
"raw": "{\n \"client_id\": 4848,\n \"info\": {\n \"Name\": \"Anders Knutsen\",\n \"Alias\": \"000FD267\",\n \"Location\": \"Lislebyveien 58\",\n \"area_code\": \"1604\",\n \"area\": \"Fredrikstad\",\n \"BusPhone\": \"69310000\",\n \"Email\": \"post@ostsik.no\",\n \"OKPassword\": \"franzjager\",\n \"SpecRequest\": \"Dette skal gjøres ved alarm på denne kunden.\",\n \"NoSigsMon\": \"1\",\n \"SinceDays\": 1,\n \"SinceHrs\": 0,\n \"SinceMins\": 30,\n \"ResetNosigsIgnored\": true,\n \"ResetNosigsDays\": 7,\n \"ResetNosigsHrs\": 0,\n \"ResetNosigsMins\": 0,\n \"InstallDateTime\": \"2023-02-20\",\n \"PanelName\": \"Ajax\",\n \"PanelSite\": \"Stue\",\n \"KeypadLocation\": \"Inngang\",\n \"SPPage\": \"Ekstra informasjon som kan være relevant.\"\n }\n}",
"options": {
"raw": {
"language": "json"
@ -184,7 +184,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"info\": {\n \"Name\": \"Anders Knutsen\",\n \"Alias\": \"000FD267\",\n \"Location\": \"Bergbyveien\",\n \"area_code\": \"1730\",\n \"area\": \"Ise\",\n \"BusPhone\": \"69310000\",\n \"Email\": \"post@ostsik.no\",\n \"OKPassword\": \"franzjager\",\n \"SpecRequest\": \"Dette skal gjøres ved alarm på denne kunden.\",\n \"NoSigsMon\": \"Disabled\",\n \"SinceDays\": 1,\n \"SinceHrs\": 0,\n \"SinceMins\": 30,\n \"ResetNosigsIgnored\": true,\n \"ResetNosigsDays\": 14,\n \"ResetNosigsHrs\": 0,\n \"ResetNosigsMins\": 0,\n \"InstallDateTime\": \"2025-12-01\",\n \"PanelName\": \"Futurehome\",\n \"PanelSite\": \"Ved tv\",\n \"KeypadLocation\": \"Inngang\",\n \"SPPage\": \"Ekstra informasjon som kan være relevant.\"\n }\n}",
"raw": "{\n \"client_id\": {{clientId}},\n \"info\": {\n \"Name\": \"Anders Knutsen\",\n \"Alias\": \"000FD267\",\n \"Location\": \"Bergbyveien\",\n \"area_code\": \"1730\",\n \"area\": \"Ise\",\n \"BusPhone\": \"69310000\",\n \"Email\": \"post@ostsik.no\",\n \"OKPassword\": \"franzjager\",\n \"SpecRequest\": \"Dette skal gjøres ved alarm på denne kunden.\",\n \"NoSigsMon\": \"Disabled\",\n \"SinceDays\": 1,\n \"SinceHrs\": 0,\n \"SinceMins\": 30,\n \"ResetNosigsIgnored\": true,\n \"ResetNosigsDays\": 14,\n \"ResetNosigsHrs\": 0,\n \"ResetNosigsMins\": 0,\n \"InstallDateTime\": \"2025-12-01\",\n \"PanelName\": \"Ajax\",\n \"PanelSite\": \"Ved tv\",\n \"KeypadLocation\": \"Inngang\",\n \"SPPage\": \"Ekstra informasjon som kan være relevant.\"\n }\n}",
"options": {
"raw": {
"language": "json"
@ -217,7 +217,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"zone\": {\n \"ZoneNo\": 1,\n \"ZoneText\": \"Tastatur\"\n }\n}\n",
"raw": "{\n \"client_id\": 123456789,\n \"zone\": {\n \"ZoneNo\": 62,\n \"ZoneText\": \"Tastatur\"\n }\n}\n",
"options": {
"raw": {
"language": "json"
@ -250,7 +250,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"zone\": {\n \"ZoneNo\": 1,\n \"ZoneText\": \"Tastatur\"\n }\n}",
"raw": "{\n \"client_id\": 123456789,\n \"zone\": {\n \"ZoneNo\": 62,\n \"ZoneText\": \"Tastaturrrrrrr\"\n }\n}",
"options": {
"raw": {
"language": "json"
@ -283,7 +283,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"user\": {\n \"User_Name\": \"Anders Knutsen\",\n \"MobileNo\": \"+4740642018\",\n \"MobileNoOrder\": 1,\n \"Email\": \"anders@alarm24.no\",\n \"Type\": \"U\",\n \"UserNo\": 1,\n \"Instructions\": \"\",\n \"CallOrder\": 1\n }\n}\n",
"raw": "{\n \"client_id\": 5555,\n \"user\": {\n \"User_Name\": \"Anders Knutsen\",\n \"MobileNo\": \"+4740642018\",\n \"MobileNoOrder\": 1,\n \"Email\": \"anders@ostsik.no\",\n \"Type\": \"U\",\n \"UserNo\": 1,\n \"Instructions\": \"\",\n \"CallOrder\": 1\n }\n}\n",
"options": {
"raw": {
"language": "json"
@ -316,7 +316,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"user\": {\n \"User_Name\": \"Anders Knutsen\",\n \"MobileNo\": \"40642018\",\n \"MobileNoOrder\": 1,\n \"Email\": \"anders@alarm24.no\",\n \"Type\": \"U\",\n \"UserNo\": 1,\n \"Instructions\": \"Do this\",\n \"CallOrder\": 1\n }\n}",
"raw": "{\n \"client_id\": {{clientId}},\n \"user\": {\n \"User_Name\": \"Anders Knutsen\",\n \"MobileNo\": \"40642018\",\n \"MobileNoOrder\": 1,\n \"Email\": \"anders@ostsik.no\",\n \"Type\": \"U\",\n \"UserNo\": 1,\n \"Instructions\": \"Do this 3\",\n \"CallOrder\": 1\n }\n}",
"options": {
"raw": {
"language": "json"
@ -354,7 +354,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"zone_no\": 1\n}",
"raw": "{\n \"client_id\": {{clientId}},\n \"zone_no\": 62\n}",
"options": {
"raw": {
"language": "json"
@ -387,7 +387,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"client_id\": {{clientId}},\n \"user_no\": 1\n}\n",
"raw": "{\n \"client_id\": {{clientId}},\n \"user_no\": 199\n}\n",
"options": {
"raw": {
"language": "json"

3
main.py
View File

@ -661,7 +661,6 @@ def _update_client_in_db_from_data(client_id: int, keyrec: KeyRecord, data: dict
panel_map = {
"ajax": 58,
"futurehome": 59,
"Climax 4G": 60,
}
if pname in panel_map:
updates["PanelTypeId"] = panel_map[pname]
@ -913,8 +912,6 @@ def _get_client_info_from_db(client_id: int, keyrec: KeyRecord) -> Optional[Clie
panel_name = "Ajax"
elif ptype_int == 59:
panel_name = "Futurehome"
elif ptype_int == 60:
panel_name = "Climax 4G"
else:
panel_name = "Panel Type"