Update json-printer-files (provided by Dennis)

remove file in wrong localtion
remove handling og checkout_history file
2023-07-06 15:10:50 +02:00 · 2023-07-06 15:10:14 +02:00 · 2023-07-04 14:00:48 +02:00 · 2023-07-04 12:17:23 +02:00 · 2023-07-04 12:14:20 +02:00 · 2023-07-04 12:14:13 +02:00
37 changed files with 756 additions and 195 deletions
--- a/.githooks/post-checkout
+++ b/.githooks/post-checkout
@@ -4,48 +4,55 @@
 # echo "CURR-HEAD=$2"
 # echo "BRANCH-CHECKOUT=$3"

-readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history"
 readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
-readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands"
-
+readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
+            
 write_log_file () {
-    if [ -f $CHECKOUT_HISTORY_FILE ]; then
-        # repo: customer_281
-        readonly repo=$(basename $(git rev-parse --show-toplevel))
-        # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 
-        readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
-        readonly line="$repo:$branch"
-        readonly now="$(date +%Y-%m-%dT%T)"
-        if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then
-            # line not found. first checkout of this branch (on this PSA).
-            # mark dc and print-templates to be downloaded by update-tool.
-            echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
-            echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
-            if grep -qE . "${OPKG_COMMANDS_FILE}"; then
-                readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
-                for opkg_c in "${opkg_commands[@]}"; do
-                    # check for lines longer than 'opkg '
-                    if [ "${#opkg_c}" -gt 4 ]; then
-                        # comment: spaces, at least one '#'
-                        grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
-                        echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
-                        echo "" >> $GIT_UPDATE_LOG 2>&1
-                    fi
-                done
-            fi
-        else
-            echo "Found existing line: $line. Do nothing"
+    # repo: customer_281
+    readonly repo=$(basename $(git rev-parse --show-toplevel))
+    # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 
+    readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
+    readonly line="$repo:$branch"
+    readonly now="$(date +%Y-%m-%dT%T)"
+    echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
+    echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
+    if [ -f "$OPKG_COMMANDS_FILE" ]; then
+        if grep -qE . "${OPKG_COMMANDS_FILE}"; then
+            readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
+            for opkg_c in "${opkg_commands[@]}"; do
+                # check for lines longer than 'opkg '
+                if [ "${#opkg_c}" -gt 4 ]; then
+                    # comment: spaces, at least one '#'
+                    grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
+                    echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
+                    echo "" >> $GIT_UPDATE_LOG 2>&1
+                fi
+            done
        fi
-        echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
-    else
-        echo "*******************************************************"
-        echo "     $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!!         "
-        echo "*******************************************************"
    fi
 }

--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
    IFS=$'\n'
 fi

+
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv

+
 #TODO: use in UpdateController

 get_blob () {   # get the blob of the file(name) passed as $1
@@ -27,6 +29,7 @@ get_commit_for_blob () {
           grep -q $1 && echo -n {} && head -n 1")
 }

+
 write_log_file () {
    local now=$(date +"%Y-%m-%dT%T")
    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
--- a/etc/dc/dc2c.4.21.bin
+++ b/etc/dc/dc2c.4.21.bin
--- a/etc/dc/dc2c.4.22.bin
+++ b/etc/dc/dc2c.4.22.bin
--- a/etc/dc/dc2c.4.33.bin
+++ b/etc/dc/dc2c.4.33.bin
--- a/etc/dc/dc2c.4.35.bin
+++ b/etc/dc/dc2c.4.35.bin
--- a/etc/dc/dc2c.bin
+++ b/etc/dc/dc2c.bin
@@ -1 +1 @@
-dc2c.4.22.bin
+dc2c.4.33.bin
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,7 +1,5 @@
 {
 "title":"DC2C_pri01",
-"project":"DBM Szeged park_coins",
-"issued":"13.04.2023 01.02",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -9,8 +7,6 @@
 "text":"PARKOLÓJEGY",
 "styl":"size 00",
 "feed":"nl",
-"text":"      Nyugta",
-"feed":"nl",
 "text":"Kérjük az elsö szélvédö",
 "feed":"nl",
 "text":"mögé jól láthatóan", 
@@ -19,6 +15,11 @@
 "feed":"nl",
 "text":"A PARKOLÓ NEM ÕRZÖTT",
 "feed":"nl",
+"text":"Please place it clearly visible",
+"feed":"nl",
+"text":"behind the",
+"text":" front windshield!",
+"feed":"nl",
 "feed":"nl",
 "text":"Rendszám: ",
 "vari":"Dynamic01",
@@ -33,6 +34,8 @@
 "text":"Parkolás helye: ",
 "feed":"nl",
 "vari":"location",
+"feed":"nl",
+"feed":"nl",
 }


--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,8 +1,5 @@
 {
 "title":"DC2C_pri02",
-"project":"DBM Szeged park_coins",
-"issued":"13.04.2023 01.01",
-
 "text":"Összeg: ",
 "styl":"size 01",
 "vari":"Dynamic02",
@@ -32,6 +29,8 @@
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:",
 "feed":"nl",
+"feed":"nl",
+"feed":"nl",
 }


--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,8 +1,9 @@
 {
 "title":"DC2C_pri04",
-"project":"empty",
-"issued":"24.05.2023 01.00",
-"text":""
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 00"
+
 }


--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,5 +1,41 @@
-{
-"title":"DC2C_pri05",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri05",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"text":"Please place it clearly visible",
+"feed":"nl",
+"text":"behind the",
+"text":" front windshield!",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,5 +1,36 @@
-{
-"title":"DC2C_pri06",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri06",
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"6720 Szeged ",
+"feed":"nl",
+"text":"Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06", 
+"feed":"nl",
+"text":"A jegy ára az ÁFA-t", 
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,5 +1,22 @@
-{
-"title":"DC2C_pri07",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri07",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel. ",
+"feed":"nl",
+"text":"Használja bankkártyáját ",
+"feed":"nl",
+"text":"  automatáinknál is!",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,5 +1,8 @@
-{
-"title":"DC2C_pri08",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri08",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 00"
+}
+
+
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -1,5 +1,41 @@
-{
-"title":"DC2C_pri09",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri09",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"text":"Please place it clearly visible",
+"feed":"nl",
+"text":"behind the",
+"text":" front windshield!",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -1,5 +1,40 @@
-{
-"title":"DC2C_pri10",
-"version":"27.02.2023 12:20 00001",
-"test":""
-}
+{
+"title":"DC2C_pri10",
+"styl":"size 01",
+"text":"Napijegy K",
+"styl":"size 00",
+"feed":"nl",
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"6720 Szeged ",
+"feed":"nl",
+"text":"Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06", 
+"feed":"nl",
+"text":"A jegy ára az ÁFA-t", 
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -1,5 +1,22 @@
-{
-"title":"DC2C_pri11",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri11",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel. ",
+"feed":"nl",
+"text":"Használja bankkártyáját ",
+"feed":"nl",
+"text":"  automatáinknál is!",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl"
+}
+
+
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -1,5 +1,9 @@
-{
-"title":"DC2C_pri12",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri12",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 00"
+
+}
+
+
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -1,5 +1,41 @@
-{
-"title":"DC2C_pri13",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri13",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"text":"Please place it clearly visible",
+"feed":"nl",
+"text":"behind the",
+"text":" front windshield!",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -1,5 +1,40 @@
-{
-"title":"DC2C_pri14",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri14",
+"styl":"size 01",
+"text":"Napijegy K",
+"styl":"size 00",
+"feed":"nl",
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"6720 Szeged ",
+"feed":"nl",
+"text":"Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06", 
+"feed":"nl",
+"text":"A jegy ára az ÁFA-t", 
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -1,5 +1,22 @@
-{
-"title":"DC2C_pri15",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri15",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel. ",
+"feed":"nl",
+"text":"Használja bankkártyáját ",
+"feed":"nl",
+"text":"  automatáinknál is!",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl"
+}
+
+
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -1,5 +1,8 @@
-{
-"title":"DC2C_pri16",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri16",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 00"
+}
+
+
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -1,5 +1,25 @@
-{
-"title":"DC2C_pri17",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri17",
+"styl":"align l",
+"feed":"margin01",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"part",
+"text":"Utazzon tovább közösségi közle-",
+"feed":"nl",
+"text":"kedéssel! Ehhez a leválasztható",
+"feed":"nl",
+"text":" szelvényhez a közösségi közle- ",
+"feed":"nl",
+"text":"kedési járművek (villamos, helyi-",
+"feed":"nl",
+"text":"járatos busz,trolibusz,vasútvilla-",
+"feed":"nl",
+"text":"mos) bankkártyás fedélzeti jegy-",
+"feed":"nl",
+"text":"kiadó automatáiból,illetve a jegy-",
+"feed":"nl",
+"feed":"nl"
+}
+
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -1,5 +1,18 @@
-{
-"title":"DC2C_pri18",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+"title":"DC2C_pri18",
+"styl":"align l",
+"feed":"margin01",
+
+"text":"árusító applikációkból Közterületi",
+"feed":"nl",
+"text":"fizető parkolás napijegyhez vál-",
+"feed":"nl",
+"text":"tott kiegészítő Körút napijegy vá-",
+"feed":"nl",
+"text":"sárolható (ára 440,-Ft)1 fő részé-",
+"feed":"nl",
+"text":"re. Ez a napijegy Szeged, Nagy-",
+"feed":"nl",
+"text":" körútig bezárólag illetve a Nagy-",
+"feed":"nl",
+"feed":"nl"
+}
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -1,5 +1,13 @@
-{
-"title":"DC2C_pri19",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri19",
+"styl":"align l",
+"feed":"margin01",
+
+"text":"körúton túli első megállóhelytől",
+"feed":"nl",
+"text":"vagy megállóhelyig korlátlan uta-",
+"feed":"nl",
+"text":"zásra érvényes a parkolás nap-",
+"feed":"nl",
+"text":"ján."
+}
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -1,5 +1,28 @@
-{
-"title":"DC2C_pri20",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri20",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 00"
+
+"text":"Ellenőrzéshez ezt a szelvényt",
+"feed":"nl",
+"text":"és az utazásra jogosító papírt" ,
+"feed":"nl",
+"text":"vagy elektronikus napijegyet ",
+"feed":"nl",
+"text":"együttesen kell bemutatni.",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolás kezdete:",
+"text":"(Kék Zóna)",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",
+"feed":"nl",
+"feed":"eject"
+
+}
+
+
--- a/etc/psa_config/DC2C_print21.json
+++ b/etc/psa_config/DC2C_print21.json
@@ -1,5 +1,40 @@
-{
-"title":"DC2C_pri21",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri21",
+"project":"DBM Szeged StartParking",
+"styl":"size 10",
+"text":"Igazoló ",
+"text":"szelvény",
+"styl":"size 00",
+"feed":"nl",
+"feed":"nl",
+"text":"     Bizonylat ",
+"feed":"nl",
+"text":"Szélvédõ mögé NEM",
+"feed":"nl",
+"text":"kell kihelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT!",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"styl":"size 10",
+"vari":"location",
+"styl":"size 00",
+"feed":"nl",
+"text":"Zárolt összeg/Ft.: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás idõpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl"
+}
+
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -1,5 +1,29 @@
-{
-"title":"DC2C_pri22",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+"title":"DC2C_pri22",
+"project":"DBM Szeged StartParking",
+"styl":"size 00",
+"text":"Automata száma: ",
+"vari":"manu",
+"feed":"nl",
+"text":"Igazoló sz. sorsz: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Az igazolo szelvény",
+"feed":"nl"
+"text":"a nyugtával együtt érvényes. ",
+"feed":"nl",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"text":"Deák Ferenc u. 31.",
+"feed":"nl",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl"
+}
+
+
--- a/etc/psa_config/DC2C_print23.json
+++ b/etc/psa_config/DC2C_print23.json
@@ -1,5 +1,34 @@
-{
-"title":"DC2C_pri23",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+"title":"DC2C_pri23",
+"project":"DBM Szeged StartParking",
+"styl":"size 00",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"   6720 Szeged",
+"feed":"nl",
+"text":" Zrínyi utca 4-8.",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06",
+"feed":"nl",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel.",
+"feed":"nl",
+"text":"Használja bankkártyáját",
+"feed":"nl",
+"text":"  automatáinknál is!",
+"feed":"nl",
+"feed":"nl",
+"text":"Leállító KÓD:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"styl":"size 00",
+"feed":"nl",
+"text":"Õrizze meg, tartsa magánál!",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -1,5 +1,39 @@
-{
-"title":"DC2C_pri24",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri24",
+"project":"DBM Szeged StopParking",
+"styl":"size 10"
+"text":"Parkolójegy",
+"styl":"size 00"
+"feed":"nl",
+"feed":"nl",
+"text":"Nyugta : ",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Leállítás helye:",
+"feed":"nl",
+"styl":"size 10"
+"vari":"location",
+"styl":"size 00",
+"text":"Leállítás idõpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"feed":"nl",
+"text":"Terhelt Összeg: ",
+"vari":"Dynamic02",
+"text":"Ft. (BK)",
+"feed":"nl",
+"text":"A nyugta az igazoló",
+"feed":"nl",
+"text":"szelvénnyel együtt"
+}
+
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -1,5 +1,31 @@
-{
-"title":"DC2C_pri25",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri25",
+"project":"DBM Szeged StopParking",
+"text":"érvényes.",
+"feed":"nl",
+"feed":"nl",
+"text":"Üf. szolg nyitvatartás:"
+"feed":"nl",
+"text":"    Arany Janos u. 5",
+"styl":"size 00",
+"feed":"nl",
+"text":"  H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"   Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"   6720 Szeged ",
+"feed":"nl",
+"text":" Zrínyi utca 4-8.",
+"feed":"nl",
+"text":"Adósz: 11092612-2-06",
+"feed":"nl",
+"text":"  A jegy ára az ÁFA-t",
+"feed":"nl",
+"text":"     tartalmazza!",
+"feed":"nl"
+}
+
+
--- a/etc/psa_config/DC2C_print26.json
+++ b/etc/psa_config/DC2C_print26.json
@@ -1,5 +1,17 @@
-{
-"title":"DC2C_pri26",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri26",
+"project":"DBM Szeged StopParking",
+"feed":"nl",
+"text":"Start azonosító:",
+"styl":"size 00",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Õrizze meg, tartsa magánál!",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_config/DC2C_print27.json
+++ b/etc/psa_config/DC2C_print27.json
@@ -1,5 +1,36 @@
-{
-"title":"DC2C_pri27",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri27",
+"project":"DBM Szeged Error",
+"styl":"size 00",
+"feed":"nl",
+"text":"TRANZAKCIÓ ELUTASÍTVA!",
+"feed":"nl",
+"feed":"nl",
+"text":"     Bizonylat",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Indítás helye:",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"text":"Kiadás idõpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Bizonylat sorsz.: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Hibaüzenet: ",
+"vari":"Dynamic06",
+"feed":"nl"
+}
+
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -1,5 +1,35 @@
-{
-"title":"DC2C_pri28",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri28",
+"project":"DBM Szeged Error",
+"styl":"size 00",
+"text":" Üf. szolg nyitvatartás:",
+"feed":"nl",
+"text":"  Deák Ferenc u. 31. ",
+"feed":"nl",
+"text":"  H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"   Tel: (80) 820-500",
+"feed":"nl",
+"feed":"nl",
+"text":"Szegedi Közlekedési Kft",
+"feed":"nl",
+"text":"     6720",
+"text":" Szeged ",
+"feed":"nl",
+"text":"  Zrínyi utca 4-8",
+"feed":"nl",
+"text":"Adósz: ", 
+"text":"11092612-2-06", 
+"feed":"nl",
+"feed":"nl",
+"text":"Parkoljon egy érintéssel.",
+"feed":"nl",
+"text":"Használja bankkártyáját",
+"feed":"nl",
+"text":"  automatáinknál",
+"text":" is!",
+"feed":"nl",
+"feed":"eject"
+
+}
+
--- a/etc/psa_config/tariff01.json
+++ b/etc/psa_config/tariff01.json
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -38,7 +38,7 @@
      "pop_max_time": 600,
      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_daily_card_price": 2400
    }
  ],
  "PaymentRate": [
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -1,25 +1,20 @@
+###############################################################################
+#                          !!! NOTE !!!
+###############################################################################
+# opkg-commands added to this file will be executed by ATBUpdateTool.          
+###############################################################################
 # opkg prefix will be added inside evaluating script
 #
-# package manipulation commands without package:
-# update, upgrade, clean
-#
-# informational commands without package:
-# list, list-installed, list-upgradable
-#
-# ptu5-atb-apinfo
-# ptu5-scripts
-# ptu5-atb-apinfo
-# atb-plugin-calculateprice-prm
-# atb-plugin-cc-tcpzvt
-# atbqt
-# list-installed
-# --force-reinstall install ptu5-atb-apinfo
-# --force-reinstall install atbqt
-# update
+# 2023-06-30: test-1
+# 2023-06-30: test-2
+# 2023-06-30: return to usual workflow
+# 2023-06-30: test update atbqt in Szeged
+# 2023-06-30: 2. test update atbqt in Szeged
+# 2023-06-30: 4. test update atbqt in Szeged
+opkg info ptu5-gitinstaller
+opkg info atbqt
 opkg update
-# opkg --noaction install atbqt
-# opkg install atbqt
-#
-#
-#
-
+opkg install ptu5-gitinstaller
+opkg install atbqt
+opkg info ptu5-gitinstaller
+opkg info atbqt
Author	SHA1	Message	Date
Gerhard Hoffmann	de0b5a3e70	Update json-printer-files (provided by Dennis)	2023-07-06 15:10:50 +02:00
Gerhard Hoffmann	e9fa1e6dd5	remove file in wrong localtion	2023-07-06 15:10:14 +02:00
Gerhard Hoffmann	ee0a06ba0b	remove handling og checkout_history file	2023-07-04 14:00:48 +02:00
Gerhard Hoffmann	96a1db1fba	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:23 +02:00
Gerhard Hoffmann	1071e8e762	Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2	2023-07-04 12:14:20 +02:00
Gerhard Hoffmann	794c26ee97	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:14:13 +02:00
Siegfried Siegert	8211505d34	Revert last ATBQT.ini change	2023-06-30 15:42:20 +02:00
Siegfried Siegert	1c08df6da1	Fix: filename	2023-06-30 15:33:45 +02:00
Siegfried Siegert	031c9653f1	Update Test for ATBQT.ini	2023-06-30 15:28:33 +02:00
Siegfried Siegert	9643f36c1d	Add dc2c.4.33.bin for test	2023-06-30 15:13:31 +02:00
Siegfried Siegert	d6ef0ac4a6	Prevent updating atbqt	2023-06-30 15:12:13 +02:00
Siegfried Siegert	bf5bce2be8	DC Update Test	2023-06-30 15:10:13 +02:00
Siegfried Siegert	ef12748e72	Szeged Test	2023-06-30 14:37:52 +02:00
Siegfried Siegert	6a47b52c24	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-30 14:36:47 +02:00
Gerhard Hoffmann	cebda53e85	return to normal workflow after testing	2023-06-30 10:51:32 +02:00
Gerhard Hoffmann	8b5f310464	Provide opkg commands for zone2	2023-06-29 14:30:39 +02:00
Gerhard Hoffmann	db54f86be9	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:21:37 +02:00
Gerhard Hoffmann	cf5b677bfe	Adding device-controller firmware version 4.35	2023-06-27 16:21:28 +02:00
Gerhard Hoffmann	d25e6232e0	install same post-merge-hook as in branch zg1/zone1	2023-06-27 14:32:34 +02:00
Gerhard Hoffmann	8949d1850c	install same post-checkout-hook as in branch zg1/zone1	2023-06-27 14:31:17 +02:00
Gerhard Hoffmann	22d1a9f8a1	Set daily_card_price to 2400 for zone4	2023-06-27 14:17:37 +02:00
Siegfried Siegert	ee70081ab3	Remove old deviceController firmware	2023-06-26 14:37:00 +02:00
Siegfried Siegert	a5f76131ff	Add correct tariff config files	2023-06-25 15:04:58 +02:00
Siegfried Siegert	7ed84450e2	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-25 14:57:42 +02:00
Siegfried Siegert	8b58d78cd8	Remove invalid config files	2023-06-25 14:57:13 +02:00
Siegfried Siegert	fe7c8bf282	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2	2023-06-19 10:37:27 +02:00
Siegfried Siegert	8fdb94ac90	Merge branch 'zg1/zone1' into zg1/zone2	2023-06-19 10:32:20 +02:00
Gerhard Hoffmann	1e629e5fea	check for existence of opkg_commands-file (2)	2023-06-05 15:58:15 +02:00
Gerhard Hoffmann	7939f576a0	check for existence of opkg_commands-file	2023-06-05 15:52:30 +02:00
Gerhard Hoffmann	bbd39fbccb	adding post-checkout hook ad for zone1	2023-06-05 15:46:25 +02:00
Gerhard Hoffmann	8d8cc811c6	Add device controller version 4.22	2023-05-31 08:58:21 +02:00
Gerhard Hoffmann	4d698ffb79	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:20:16 +02:00
Gerhard Hoffmann	e83e1589fb	Adding dc-version 4.21	2023-05-24 16:19:39 +02:00
Gerhard Hoffmann	4bf9efcf3a	Updating print templates as of 11 May, 2023.	2023-05-18 12:15:37 +02:00
Siegfried Siegert	be84634d62	Update ATBQT.ini SysetemControl.ini for Szeged Test	2023-05-05 10:59:31 +02:00
Gerhard Hoffmann	64937d6fb4	Add tariff-file for zone 4	2023-05-04 10:55:28 +02:00
Gerhard Hoffmann	6acc53275d	Update as for branch zg1/zone1	2023-04-25 11:53:41 +02:00
Gerhard Hoffmann	87af143cbd	Removed *.ini-Files.	2023-03-31 11:46:54 +02:00
Gerhard Hoffmann	e46c1f272b	Add .gitignore	2023-03-31 09:51:38 +02:00
Gerhard Hoffmann	73fbc3d5ad	Add handling for binary dc-files	2023-03-30 12:48:33 +02:00