Skip to content

Update to Iris version 12 #1

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

Open
kataras wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Iris version 12 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions decisiondateedit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"log"
"strings"

"github.com/kataras/iris"
"github.com/kataras/iris/v12"
"github.com/kataras/iris/v12/sessions"

"github.com/zew/decisiondates/gorpx"
"github.com/zew/decisiondates/mdl"
"github.com/zew/irisx"
"github.com/zew/logx"
"github.com/zew/util"
)

func decisionDateEdit(c *iris.Context) {
func decisionDateEdit(c iris.Context) {

var err error
display := ""
Expand All @@ -24,8 +24,8 @@ func decisionDateEdit(c *iris.Context) {

//
//
srcPageId, _, _ := irisx.EffectiveParamInt(c, "SrcPageId", -1)
srcPdfId, _, _ := irisx.EffectiveParamInt(c, "SrcPdfId", -1)
srcPageId := EffectiveParamInt(c, "SrcPageId", -1)
srcPdfId := EffectiveParamInt(c, "SrcPdfId", -1)
if srcPageId > 0 {
sql := `SELECT
*
Expand All @@ -48,7 +48,7 @@ func decisionDateEdit(c *iris.Context) {

//
// Deviating
dCN := irisx.EffectiveParam(c, "DeviatingCommName", "")
dCN := EffectiveParam(c, "DeviatingCommName", "")
dKey, dName, displ2 := deviatingComm(dCN)
display += displ2
if dKey != "" {
Expand Down Expand Up @@ -114,7 +114,7 @@ func decisionDateEdit(c *iris.Context) {
}{
HTMLTitle: AppName() + " - Edit decision date",
Title: AppName() + " - Edit decision date",
FlashMsg: template.HTML(c.GetFlash(DecisionDateSave)),
FlashMsg: template.HTML(sessions.Get(c).GetFlashString(DecisionDateSave)),
Links: links,

StructDump: template.HTML(display),
Expand All @@ -127,13 +127,13 @@ func decisionDateEdit(c *iris.Context) {

ParamDeviatingCommName: dCN,

ParamSrcPageId: irisx.EffectiveParam(c, "SrcPageId", ""),
ParamSrcPdfId: irisx.EffectiveParam(c, "SrcPdfId", ""),
ParamSrcPageId: EffectiveParam(c, "SrcPageId", ""),
ParamSrcPdfId: EffectiveParam(c, "SrcPdfId", ""),

Decisions: decisions,
}

err = c.Render("decision-date-edit.html", s)
err = c.View("decision-date-edit.html", s)
util.CheckErr(err)

}
Expand Down
19 changes: 10 additions & 9 deletions decisiondatesave.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,27 @@ import (
"fmt"
"strings"

"github.com/kataras/iris"
"github.com/kataras/iris/v12"
"github.com/kataras/iris/v12/sessions"
"github.com/zew/decisiondates/gorpx"
"github.com/zew/decisiondates/mdl"
"github.com/zew/irisx"
"github.com/zew/util"
)

func decisionDateSave(c *iris.Context) {
func decisionDateSave(c iris.Context) {

var msg bytes.Buffer
sess := sessions.Get(c)

defer func() {
c.SetFlash(DecisionDateSave, msg.String())
sess.SetFlash(DecisionDateSave, msg.String())
c.Redirect(
Pref(DecisionDateEdit) +
fmt.Sprintf(
"?SrcPageId=%v&SrcPdfId=%v&DeviatingCommName=%v",
irisx.EffectiveParam(c, "SrcPageId"),
irisx.EffectiveParam(c, "SrcPdfId"),
irisx.EffectiveParam(c, "DeviatingCommName"),
EffectiveParam(c, "SrcPageId"),
EffectiveParam(c, "SrcPdfId"),
EffectiveParam(c, "DeviatingCommName"),
),
)
}()
Expand All @@ -40,10 +41,10 @@ func decisionDateSave(c *iris.Context) {
}

frm := FormDecisions{}
if c.IsPost() {
if c.Method() == iris.MethodPost {
err := c.ReadForm(&frm)
if err != nil {
msg.WriteString(fmt.Sprintf("Each form field must be accomodated in the struct! %v\n", err))
msg.WriteString(fmt.Sprintf("Each form field must be accommodated in the struct! %v\n", err))
return
}

Expand Down
17 changes: 8 additions & 9 deletions extracttextfrompdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,26 @@ import (
"os"
"strings"

"github.com/kataras/iris"
"github.com/kataras/iris/v12"
"github.com/pbberlin/pdf"

"github.com/zew/decisiondates/gorpx"
"github.com/zew/decisiondates/mdl"
"github.com/zew/irisx"
"github.com/zew/logx"
"github.com/zew/util"
)

func processPdf(c *iris.Context) {
func processPdf(c iris.Context) {

var err error
display := ""
respBytes := []byte{}
strUrl := ""

if irisx.EffectiveParam(c, "submit", "none") != "none" {
if EffectiveParam(c, "submit", "none") != "none" {

start, _, _ := irisx.EffectiveParamInt(c, "Start", 1)
cnt, _, _ := irisx.EffectiveParamInt(c, "Count", 5)
start := EffectiveParamInt(c, "Start", 1)
cnt := EffectiveParamInt(c, "Count", 5)
end := start + cnt

//
Expand Down Expand Up @@ -214,11 +213,11 @@ func processPdf(c *iris.Context) {
Url: strUrl,
FormAction: PathProcessPdfs,

ParamStart: irisx.EffectiveParam(c, "Start", "0"),
ParamCount: irisx.EffectiveParam(c, "Count", "3"),
ParamStart: EffectiveParam(c, "Start", "0"),
ParamCount: EffectiveParam(c, "Count", "3"),
}

err = c.Render("results.html", s)
err = c.View("results.html", s)
util.CheckErr(err)

}
Expand Down
15 changes: 15 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module github.com/zew/decisiondates

go 1.13

require (
github.com/go-sql-driver/mysql v1.4.1
github.com/kataras/iris/v12 v12.0.1
github.com/mattn/go-sqlite3 v1.11.0
github.com/pbberlin/pdf v0.0.0-20160630134521-819001ec5cb1
github.com/zew/gorp v0.0.0-20180321143528-9d53eef2f7e4
github.com/zew/logx v0.0.0-20180516170210-9f79c321751a
github.com/zew/util v0.0.0-20190309202910-a8bebbe09dc9
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
google.golang.org/api v0.13.0
)
Loading