sub-packages, quotation marking and environment variables implemented

build-release.cmd

@@ -1,2 +1,5 @@
+cd internal\config
+go generate
+cd ..\..
 go generate
 go build -ldflags "-H=windowsgui -s -w" -trimpath

build-release.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+cd internal/config
+go generate
+cd ../..
 go generate
 go build -ldflags "-s -w" -trimpath
 #chmod +x ./edm

companies.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"database/sql"
+	"edm/pkg/accs"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -13,6 +14,7 @@ import (
 // CompaniesPage is passed into template
 type CompaniesPage struct {
 	AppTitle      string
+	AppVersion    string
 	PageTitle     string
 	LoggedinID    int
 	LoggedinAdmin bool
@@ -39,6 +41,7 @@ func (bs *BaseStruct) companiesHandler(w http.ResponseWriter, r *http.Request) {
 
 	var Page = CompaniesPage{
 		AppTitle:   bs.text.AppTitle,
+		AppVersion: AppVersion,
 		PageTitle:  bs.text.CompaniesPageTitle,
 		LoggedinID: id,
 	}
@@ -137,7 +140,7 @@ ORDER BY c.ShortName ASC, c.FullName ASC, c.ForeignName ASC`)
 	}()
 
 	if err != nil {
-		log.Println(currentFunction()+":", err)
+		log.Println(accs.CurrentFunction()+":", err)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		//http.Error(w, err.Error(), http.StatusInternalServerError) //Commented to not displayng error details to end user
 		return
@@ -155,7 +158,7 @@ ORDER BY c.ShortName ASC, c.FullName ASC, c.ForeignName ASC`)
 	// HTML output
 	err = bs.templates.ExecuteTemplate(w, "companies.tmpl", Page)
 	if err != nil {
-		log.Println(currentFunction()+":", err)
+		log.Println(accs.CurrentFunction()+":", err)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		//http.Error(w, err.Error(), http.StatusInternalServerError) //Commented to not displayng error details to end user
 		return

company.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"database/sql"
+	"edm/pkg/accs"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -40,7 +41,7 @@ func unmarshalNonEmptyCompanyContacts(c string) (res CompanyContacts) {
 	if c != "" {
 		err := json.Unmarshal([]byte(c), &res)
 		if err != nil {
-			log.Println(currentFunction()+":", err)
+			log.Println(accs.CurrentFunction()+":", err)
 		}
 	}
 	return res
@@ -255,6 +256,7 @@ func (u Unit) GiveHeadNameJob() (head string) {
 // CompanyPage is passed into template
 type CompanyPage struct {
 	AppTitle   string
+	AppVersion string
 	PageTitle  string
 	LoggedinID int
 	UserConfig UserConfig
@@ -282,6 +284,7 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 
 	var Page = CompanyPage{
 		AppTitle:   bs.text.AppTitle,
+		AppVersion: AppVersion,
 		LoggedinID: id,
 		Editable:   false,
 		New:        false,
@@ -293,7 +296,7 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 		Page.Editable = true
 	}
 
-	TextID := getTextIDfromURL(r.URL.Path)
+	TextID := accs.GetTextIDfromURL(r.URL.Path)
 	IntID, _ := strconv.Atoi(TextID)
 
 	var created int
@@ -302,7 +305,7 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 	// Create or update code ==========================================================================
 	if r.Method == "POST" && (r.FormValue("createButton") != "" || r.FormValue("updateButton") != "") {
 		if Page.Editable == false {
-			throwAccessDenied(w, "writing company", Page.LoggedinID, IntID)
+			accs.ThrowAccessDenied(w, "writing company", Page.LoggedinID, IntID)
 			return
 		}
 		c := Company{
@@ -358,7 +361,7 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 	// Create or update Units =====================================================================
 	if r.Method == "POST" && (r.FormValue("createUnit") != "" || r.FormValue("updateUnit") != "") {
 		if Page.Editable == false {
-			throwAccessDenied(w, "writing unit", Page.LoggedinID, IntID)
+			accs.ThrowAccessDenied(w, "writing unit", Page.LoggedinID, IntID)
 			return
 		}
 		UnitIntID, _ := strconv.Atoi(r.FormValue("unitID"))
@@ -389,7 +392,7 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 	// Delete Unit ================+==========================
 	if r.Method == "POST" && r.FormValue("deleteUnit") != "" {
 		if Page.Editable == false {
-			throwAccessDenied(w, "writing unit", Page.LoggedinID, IntID)
+			accs.ThrowAccessDenied(w, "writing unit", Page.LoggedinID, IntID)
 			return
 		}
 		UnitIntID, _ := strconv.Atoi(r.FormValue("unitID"))
@@ -414,13 +417,13 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 		Page.Company.ID = IntID
 		err = Page.Company.load(bs.db, bs.dbt)
 		if err != nil {
-			log.Println(currentFunction()+":", err)
+			log.Println(accs.CurrentFunction()+":", err)
 			http.NotFound(w, r)
 			return
 		}
 		Page.Units, err = Page.Company.loadUnits(bs.db, bs.dbt)
 		if err != nil {
-			log.Println(currentFunction()+":", err)
+			log.Println(accs.CurrentFunction()+":", err)
 			http.NotFound(w, r)
 			return
 		}
@@ -448,8 +451,8 @@ func (bs *BaseStruct) companyHandler(w http.ResponseWriter, r *http.Request) {
 	// HTML output
 	err = bs.templates.ExecuteTemplate(w, "company.tmpl", Page)
 	if err != nil {
-		log.Println(currentFunction()+":", err)
-		throwServerError(w, "executing company template", Page.LoggedinID, Page.Company.ID)
+		log.Println(accs.CurrentFunction()+":", err)
+		accs.ThrowServerError(w, "executing company template", Page.LoggedinID, Page.Company.ID)
 		return
 	}
 

edm_test.go → date_test.go

@@ -1,23 +1,9 @@
 package main
 
 import (
-	"strings"
 	"testing"
 )
 
-func TestReadiniForComments(t *testing.T) {
-	testmap, err := readini("./testfiles/testini.cfg")
-	if err != nil {
-		t.Errorf("Expected map of settings, received:%v", err)
-	}
-	for k, v := range testmap {
-		t.Log("pair:" + k + ":" + v)
-		if strings.Contains(k, "#commented") {
-			t.Errorf("Expected omit comments, received:%s:%s", k, v)
-		}
-	}
-}
-
 func TestDateToInt64(t *testing.T) {
 	var d, rev Date
 	var res int64

docs.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"database/sql"
+	"edm/pkg/accs"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -14,6 +15,7 @@ import (
 // DocsPage is passed into template
 type DocsPage struct {
 	AppTitle      string
+	AppVersion    string
 	PageTitle     string
 	LoggedinID    int
 	LoggedinAdmin bool
@@ -50,6 +52,7 @@ func (bs *BaseStruct) docsHandler(w http.ResponseWriter, r *http.Request) {
 
 	var Page = DocsPage{
 		AppTitle:     bs.text.AppTitle,
+		AppVersion:   AppVersion,
 		PageTitle:    bs.text.DocsPageTitle,
 		Categories:   bs.text.Categories,
 		DocTypes:     bs.text.DocTypes,
@@ -264,7 +267,7 @@ func (bs *BaseStruct) docsHandler(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	if err != nil {
-		log.Println(currentFunction()+":", err)
+		log.Println(accs.CurrentFunction()+":", err)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		//http.Error(w, err.Error(), http.StatusInternalServerError) //Commented to not displayng error details to end user
 		return
@@ -286,7 +289,7 @@ func (bs *BaseStruct) docsHandler(w http.ResponseWriter, r *http.Request) {
 	// HTML output
 	err = bs.templates.ExecuteTemplate(w, "docs.tmpl", Page)
 	if err != nil {
-		log.Println(currentFunction()+":", err)
+		log.Println(accs.CurrentFunction()+":", err)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		//http.Error(w, err.Error(), http.StatusInternalServerError) //Commented to not displayng error details to end user
 		return