added more json feedback

app/controllers/home.go

@@ -2,12 +2,31 @@ package controllers
import (
    "github.com/revel/revel"
    "github.com/revolvingcow/grassfed/app/models"
)
type Home struct {
    Application
}
func (c Home) getNumberOfAccounts() (count int64) {
    count, err := c.Transaction.SelectInt(`select count(*) from Account`)
    if err != nil {
        return 0
    }
    return count
}
func (c Home) getNumberOfCalories() (calories int64) {
    calories, err := c.Transaction.SelectInt(`select sum(Calories) from History`)
    if err != nil {
        return 0
    }
    return calories
}
func (c Home) Index() revel.Result {
	return c.Render()
}
@@ -15,3 +34,12 @@ func (c Home) Index() revel.Result {
func (c Home) About() revel.Result {
    return c.Render()
}
func (c Home) Overview() revel.Result {
    model := models.Overview {
        Accounts: c.getNumberOfAccounts(),
        Calories: c.getNumberOfCalories(),
    }
    return c.RenderJson(model)
}

app/controllers/profile.go

@@ -1,6 +1,7 @@
package controllers
import (
    "fmt"
    "strings"
    "time"
    "github.com/revel/revel"
@@ -38,6 +39,47 @@ func (c Profile) getHistory(account *models.Account) []*models.History {
    return history
}
func (c Profile) getCaloriesForDate(history []*models.History, date time.Time) (current int64) {
    current = 0
    if history != nil {
        for _, moment := range history {
            if moment != nil {
                local := moment.Date.Local()
                if local.Day() == date.Day() && local.Month() == date.Month() && local.Year() == date.Year() {
                    current += moment.Calories
                }
            }
        }
    }
    return current
}
func (c Profile) getStreak(history []*models.History, ceiling int64) (streak int64) {
    now := time.Now()
    streak = 0
    if history != nil && len(history) > 0 {
        interval := 1
        for {
            s := fmt.Sprintf("-%dh", interval * 24)
            duration, _ := time.ParseDuration(s)
            count := c.getCaloriesForDate(history, now.Add(duration))
            if count > 0 && ceiling > count {
                streak += 1
                interval += 1
            } else {
                break
            }
        }
    }
    return streak
}
func (c Profile) getMoment(id int64) *models.History {
    history, err := c.Transaction.Select(models.History{}, `select * from History where Id = ?`, id)
    if err != nil {
@@ -106,26 +148,12 @@ func (c Profile) Stats() revel.Result {
        return c.RenderJson(nil)
    }
    now := time.Now().Local()
    history := c.getHistory(account)
    current := int64(0)
    if history != nil {
        for _, moment := range history {
            if moment != nil {
                utcMoment := moment.Date.Local()
                if utcMoment.Day() == now.Day() && utcMoment.Month() == now.Month() && utcMoment.Year() == now.Year() {
                    revel.INFO.Println(utcMoment)
                    revel.INFO.Println(now)
                    current += moment.Calories
                }
            }
        }
    }
    response := models.ResponseStatistics {
        Goal: account.Goal,
        Current: current,
        Current: c.getCaloriesForDate(history, time.Now()),
        Streak: c.getStreak(history, account.Goal),
    }
    return c.RenderJson(response)

app/init.go

@@ -33,8 +33,10 @@ func init() {
// should probably also have a filter for CSRF
// not sure if it can go in the same filter or not
var HeaderFilter = func(c *revel.Controller, fc []revel.Filter) {
	// Add some common security headers
	c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN")
    // This was commented out so I could mask the origins with DNS
    //c.Response.Out.Header().Add("X-Frame-Options", "SAMEORIGIN")
    // Add some common security headers
	c.Response.Out.Header().Add("X-XSS-Protection", "1; mode=block")
	c.Response.Out.Header().Add("X-Content-Type-Options", "nosniff")

app/models/overview.go

@@ -0,0 +1,6 @@
package models
type Overview struct {
    Accounts int64
    Calories int64
}

app/models/statistics.go

@@ -3,4 +3,5 @@ package models
type ResponseStatistics struct {
    Goal int64
    Current int64
    Streak int64
}

app/routes/routes.go

@@ -176,4 +176,11 @@ func (_ tHome) About(
	return revel.MainRouter.Reverse("Home.About", args).Url
}
func (_ tHome) Overview(
		) string {
	args := make(map[string]string)
	
	return revel.MainRouter.Reverse("Home.Overview", args).Url
}

app/tmp/main.go

@@ -125,7 +125,7 @@ func main() {
				Args: []*revel.MethodArg{ 
				},
				RenderArgNames: map[int][]string{ 
					55: []string{ 
					97: []string{ 
					},
				},
			},
@@ -186,7 +186,7 @@ func main() {
				Args: []*revel.MethodArg{ 
				},
				RenderArgNames: map[int][]string{ 
					12: []string{ 
					31: []string{ 
					},
				},
			},
@@ -195,20 +195,27 @@ func main() {
				Args: []*revel.MethodArg{ 
				},
				RenderArgNames: map[int][]string{ 
					16: []string{ 
					35: []string{ 
					},
				},
			},
			&revel.MethodType{
				Name: "Overview",
				Args: []*revel.MethodArg{ 
				},
				RenderArgNames: map[int][]string{ 
				},
			},
			
		})
	
	revel.DefaultValidationKeys = map[string]map[int]string{ 
		"github.com/revolvingcow/grassfed/app/controllers.Profile.Add": { 
			140: "product",
			141: "calories",
			168: "product",
			169: "calories",
		},
		"github.com/revolvingcow/grassfed/app/controllers.Profile.Logon": { 
			60: "id",
			102: "id",
		},
	}
	revel.TestSuites = []interface{}{ 

app/views/Home/Index.html

@@ -1,33 +1,21 @@
{{set . "title" "Home"}}
{{template "header.html" .}}
{{append . "moreScripts" "/public/js/overview.js"}}
<div class="jumbotron">
    <h1></h1>
    
    <div class="row">
        <div class="col-md-4 text-center">
            <h3>0</h3>
            <h3>Users</h3>
        </div>
        <div class="col-md-4 text-center">
            <h3>0</h3>
            <h3>Something else</h3>
            <h3 class="accounts">0</h3>
            <h3>Accounts</h3>
        </div>
        <div class="col-md-4 text-center">
            <h3>0</h3>
            <h3>And then...</h3>
            <h3 class="calories">0</h3>
            <h3>Calories</h3>
        </div>
    </div>
</div>
<!--<span id="signinButton">
    <span
        class="g-signin"
        data-callback="onAuthentication"
        data-clientid="903785837828-lfsps917vkth7c88em9ieq0l0d0p35kb.apps.googleusercontent.com"
        data-cookiepolicy="single_host_origin"
        data-requestvisibleactions=""
        data-scope="profile">
    </span>
</span>-->
{{template "footer.html" .}}

app/views/Profile/Index.html

@@ -70,8 +70,8 @@
        </form>
        <h3>Streak</h3>
        <p class="text-center">0 days</p>
        <h3 class="streak text-center">0</h3>
        <h3 class="streak-units text-center">days</h3>
    </div>
</div>

app/views/footer.html

@@ -4,6 +4,21 @@
    {{range .moreScripts}}
        <script type="text/javascript" charset="utf-8" src="{{.}}"></script>
    {{end}}
    <script type="text/javascript">
        $(function () {
            var loc = window.location.href;
            var menuItems = $('.nav.navbar-nav').find('li > a');
            for (var i = 0 ; i < menuItems.length; i++) {
                var href = $(menuItems[i]).attr('href');
                if (loc.indexOf(href, loc.length - href.length) !== -1) {
                    $(menuItems[i]).parents('li').addClass('active');
                }
            }
        });
    </script>
  
    {{if eq .RunMode "dev"}}
        {{template "debug.html" .}}

app/views/header.html

@@ -31,7 +31,7 @@
            </div>
            <div class="navbar-collapse collapse">
                <ul class="nav navbar-nav">
                    <li class="active"><a href="/">Overview</a></li>
                    <li><a href="/">Overview</a></li>
                    <li><a href="/about">About</a></li>
                    <li><a href="//github.com/revolvingcow/grassfed">Get The Code!</a></li>
                </ul>

conf/routes

@@ -6,6 +6,7 @@ module:testrunner
GET     /                                       Home.Index
GET     /about                                  Home.About
POST    /overview                               Home.Overview
GET     /me                                     Profile.Index
POST    /me/logon                               Profile.Logon
GET     /me/history                             Profile.History

public/js/grassfed.js

@@ -20,6 +20,9 @@ $(function () {
        // Pull the information we need first.
        loadStatistics();
        loadHistory();
        // Set focus.
        $('input[name="products"][type="text"]').focus();
    }
    $('div#profile').on('show', function () {
@@ -47,6 +50,9 @@ $(function () {
                    var previousCalories = parseInt($('input[name="current"][type="hidden"]').val());
                    $('input[name="current"][type="hidden"]').val(previousCalories + response.Calories);
                    updateChart();
                    // Reset focus.
                    $('input[name="products"][type="text"]').focus();
                }
            });
@@ -139,6 +145,8 @@ $(function () {
                    $('input[name="calories"][type="range"]').val(response.Goal);
                    $('span.goal').text(response.Goal);
                    $('input[name="current"][type="hidden"]').val(response.Current);
                    $('.streak').text(response.Streak);
                    $('.streak-unit').text('days');
                }
                updateChart();

public/js/overview.js

@@ -0,0 +1,9 @@
$(function () {
    $.post('/overview')
    .done(function (response) {
        if (response) {
            $('.accounts').text(response.Accounts);
            $('.calories').text(response.Calories);
        }
    });
});