Newgoaldisplay (#200)

* draft goaldisplay

* almost ready to port

* make goal management 1000% less buggy and more sane

still need to implement sorts and i guess some way to scroll the list

* i cant believe its not dunner

Themes/Til Death/BGAnimations/packlistDisplay.lua

@@ -51,6 +51,8 @@ local o = Def.ActorFrame{
 	UpdateCommand=function(self)
 		if ind < 0 then
 			ind = 0
+		elseif ind == #packtable then
+			ind = ind - numpacks
 		elseif ind > #packtable - (#packtable % numpacks) then
 			ind = #packtable - (#packtable % numpacks)
 		end

src/DownloadManager.cpp

@@ -634,7 +634,11 @@ void DownloadManager::AddGoal(string chartkey, float wife, float rate, DateTime
 
 void DownloadManager::UpdateGoal(string chartkey, float wife, float rate, bool achieved, DateTime timeAssigned, DateTime timeAchieved)
 {
-	string req = "user/" + DLMAN->sessionUser + "/goals";
+	string doot = "0000:00:00 00:00:00";
+	if (achieved)
+		doot = timeAchieved.GetString();
+
+	string req = "user/" + DLMAN->sessionUser + "/goals/update";
 	auto done = [](HTTPRequest& req, CURLMsg *) {
 
 	};
@@ -643,7 +647,7 @@ void DownloadManager::UpdateGoal(string chartkey, float wife, float rate, bool a
 		make_pair("wife", to_string(wife)),
 		make_pair("achieved", to_string(achieved)),
 		make_pair("timeAssigned", timeAssigned.GetString()),
-		make_pair("timeAchieved", timeAchieved.GetString()) };
+		make_pair("timeAchieved", doot) };
 	SendRequest(req, postParams, done, true, true);
 }
 

src/Profile.cpp

@@ -41,6 +41,7 @@
 #include "ScreenManager.h"
 #include "XMLProfile.h"
 #include "DownloadManager.h"
+#include "RageString.h"
 
 /** @brief The filename for where one can edit their personal profile information. */
 const RString EDITABLE_INI         = "Editable.ini";
@@ -1230,7 +1231,7 @@ void Profile::AddGoal(const string& ck) {
 	ScoreGoal goal;
 	goal.timeassigned = DateTime::GetNowDateTime();
 	goal.rate = GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate;
-
+	goal.chartkey = ck;
 	// duplication avoidance should be simpler than this? -mina
 	if (goalmap.count(ck))
 	for (auto& n : goalmap[ck].goals)
@@ -1240,6 +1241,19 @@ void Profile::AddGoal(const string& ck) {
 
 	goal.CheckVacuity();
 	goalmap[ck].Add(goal);
+	DLMAN->AddGoal(ck, goal.percent, goal.rate, goal.timeassigned);
+	FillGoalTable();
+	MESSAGEMAN->Broadcast("GoalTableRefresh");
+}
+
+void Profile::FillGoalTable() {
+	goaltable.clear();
+	for (auto& sgv : goalmap)
+		for (auto& sg : sgv.second.goals)
+			goaltable.emplace_back(&sg);
+
+	auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->timeassigned > b->timeassigned; };
+	sort(goaltable.begin(), goaltable.end(), comp);
 }
 
 XNode* ScoreGoal::CreateNode() const {
@@ -1328,6 +1342,7 @@ void Profile::SetAnyAchievedGoals(const string& ck, float& rate, const HighScore
 			tmp.achieved = true;
 			tmp.timeachieved = pscore.GetDateTime();
 			tmp.scorekey = pscore.GetScoreKey();
+			DLMAN->UpdateGoal(tmp.chartkey, tmp.percent, tmp.rate, tmp.achieved, tmp.timeassigned, tmp.timeachieved);
 		}
 	}
 }
@@ -1577,24 +1592,127 @@ class LunaProfile : public Luna<Profile>
 	}
 
 	DEFINE_METHOD(GetGUID, m_sGuid);
-	static int GetAllGoals(T* p, lua_State *L) {
-		lua_newtable(L);
-		int idx = 0;
-		FOREACHUM(string, GoalsForChart, p->goalmap, i) {
-			const string &ck = i->first;
-			auto &sgv = i->second.Get();
-			FOREACH(ScoreGoal, sgv, sg) {
-				ScoreGoal &tsg = *sg;
-				if(ck != "")	// not sure how this can happen or if it is happening here... but it shouldn't be able to -mina
-					tsg.chartkey = ck;
-				tsg.PushSelf(L);
-				lua_rawseti(L, -2, idx + 1);
-				idx++;
+
+	static int GetGoalTable(T* p, lua_State *L) {
+		LuaHelpers::CreateTableFromArray(p->goaltable, L);
+		return 1;
+	}
+	static int SetFromAll(T* p, lua_State *L) {
+		p->FillGoalTable();
+		p->filtermode = 1;
+		return 1;
+	}
+
+	static int SortByDate(T* p, lua_State* L) {
+		if (p->sortmode == 1)
+			if (p->asc) {
+				auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->timeassigned > b->timeassigned; };	// custom operators?
+				sort(p->goaltable.begin(), p->goaltable.end(), comp);
+				p->asc = false;
+				return 1;
 			}
-		}
+		auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->timeassigned < b->timeassigned; };
+		sort(p->goaltable.begin(), p->goaltable.end(), comp);
+		p->sortmode = 1;
+		p->asc = true;
+		return 1;
+	}
+
+	static int SortByRate(T* p, lua_State* L) {
+		if (p->sortmode == 2)
+			if (p->asc) {
+				auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->rate > b->rate; };	// custom operators?
+				sort(p->goaltable.begin(), p->goaltable.end(), comp);
+				p->asc = false;
+				return 1;
+			}
+		auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->rate < b->rate; };
+		sort(p->goaltable.begin(), p->goaltable.end(), comp);
+		p->sortmode = 2;
+		p->asc = true;
+		return 1;
+	}
+
+	static int SortByName(T* p, lua_State* L) {
+		if (p->sortmode == 3)
+			if (p->asc) {
+				auto comp = [](ScoreGoal* a, ScoreGoal* b) { return Rage::make_lower(SONGMAN->GetSongByChartkey(a->chartkey)->GetDisplayMainTitle()) >
+					Rage::make_lower(SONGMAN->GetSongByChartkey(b->chartkey)->GetDisplayMainTitle()); };	// custom operators?
+				sort(p->goaltable.begin(), p->goaltable.end(), comp);
+				p->asc = false;
+				return 3;
+			}
+		auto comp = [](ScoreGoal* a, ScoreGoal* b) { return Rage::make_lower(SONGMAN->GetSongByChartkey(a->chartkey)->GetDisplayMainTitle()) < 
+			Rage::make_lower(SONGMAN->GetSongByChartkey(b->chartkey)->GetDisplayMainTitle()); };
+		sort(p->goaltable.begin(), p->goaltable.end(), comp);
+		p->sortmode = 3;
+		p->asc = true;
+		return 1;
+	}
+
+	static int SortByPriority(T* p, lua_State* L) {
+		if (p->sortmode == 4)
+			if (p->asc) {
+				auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->priority > b->priority; };	// custom operators?
+				sort(p->goaltable.begin(), p->goaltable.end(), comp);
+				p->asc = false;
+				return 3;
+			}
+		auto comp = [](ScoreGoal* a, ScoreGoal* b) { return a->priority < b->priority; };
+		sort(p->goaltable.begin(), p->goaltable.end(), comp);
+		p->sortmode = 4;
+		p->asc = true;
+		return 1;
+	}
+
+	static int SortByDiff(T* p, lua_State* L) {
+		if (p->sortmode == 5)
+			if (p->asc) {
+				auto comp = [](ScoreGoal* a, ScoreGoal* b) { return SONGMAN->GetStepsByChartkey(a->chartkey)->GetMSD(a->rate, 0) >
+					SONGMAN->GetStepsByChartkey(b->chartkey)->GetMSD(b->rate, 0); };
+				sort(p->goaltable.begin(), p->goaltable.end(), comp);
+				p->asc = false;
+				return 3;
+			}
+		auto comp = [](ScoreGoal* a, ScoreGoal* b) { return SONGMAN->GetStepsByChartkey(a->chartkey)->GetMSD(a->rate, 0) <
+			SONGMAN->GetStepsByChartkey(b->chartkey)->GetMSD(b->rate, 0); };
+		sort(p->goaltable.begin(), p->goaltable.end(), comp);
+		p->sortmode = 5;
+		p->asc = true;
 		return 1;
 	}
 
+	static int ToggleFilter(T* p, lua_State* L) {
+		p->FillGoalTable();
+
+		if (p->filtermode == 3) {
+			p->filtermode = 1;
+			return 1;
+		}
+
+		vector<ScoreGoal*> doot;
+		if (p->filtermode == 1) {
+			for (auto& sg : p->goaltable)
+				if(sg->achieved)
+					doot.emplace_back(sg);
+			p->goaltable = doot;
+			p->filtermode = 2;
+			return 1;
+		}
+		if (p->filtermode == 2) {
+			for (auto& sg : p->goaltable)
+				if (!sg->achieved)
+					doot.emplace_back(sg);
+			p->goaltable = doot;
+			p->filtermode = 3;
+			return 1;
+		}
+		return 1;
+	}
+	static int GetFilterMode(T* p, lua_State *L) {
+		lua_pushnumber(L, p->filtermode);
+		return 1;
+	}
 	static int GetIgnoreStepCountCalories(T* p, lua_State *L) {
 		lua_pushboolean(L, 0);
 		return 1;
@@ -1689,12 +1807,20 @@ class LunaProfile : public Luna<Profile>
 		ADD_METHOD( GetPlayerRating );
 		ADD_METHOD( GetPlayerSkillsetRating );
 		ADD_METHOD( GetNumFaves );
-		ADD_METHOD( GetAllGoals );
+		ADD_METHOD(GetGoalTable);
 		ADD_METHOD(GetIgnoreStepCountCalories);
 		ADD_METHOD(CalculateCaloriesFromHeartRate);
 		ADD_METHOD(IsCurrentChartPermamirror);
 		ADD_METHOD(GetEasiestGoalForChartAndRate);
 		ADD_METHOD(RenameProfile);
+		ADD_METHOD(SetFromAll);
+		ADD_METHOD(SortByDate);
+		ADD_METHOD(SortByRate);
+		ADD_METHOD(SortByPriority);
+		ADD_METHOD(SortByName);
+		ADD_METHOD(SortByDiff);
+		ADD_METHOD(ToggleFilter);
+		ADD_METHOD(GetFilterMode);
 	}
 };
 
@@ -1727,14 +1853,19 @@ class LunaScoreGoal : public Luna<ScoreGoal>
 			p->CheckVacuity();
 			p->UploadIfNotVacuous();
 		}
-
 		return 1; 
 	}
 
 	static int SetPercent(T* p, lua_State *L) {
 		if (!p->achieved) {
 			float newpercent = FArg(1);
 			CLAMP(newpercent, .8f, 1.f);
+
+			if (p->percent < 0.995f && newpercent > 0.995f)
+				newpercent = 0.9975f;
+			if (p->percent < 0.9990f && newpercent > 0.9997f)
+				newpercent = 0.9997f;
+
 			p->percent = newpercent;
 			p->CheckVacuity();
 			p->UploadIfNotVacuous();

src/Profile.h

@@ -273,6 +273,11 @@ class Profile
 	void AddGoal(const string& ck);
 	void RemoveGoal(const string& ck, DateTime assigned);
 	unordered_map<string, GoalsForChart> goalmap;
+	void FillGoalTable();
+	vector<ScoreGoal*> goaltable;
+	int sortmode = 1;	// 1=date 2=rate 3=name 4=priority 5=diff, init to name because that's the default- mina
+	int filtermode = 1; // 1=all, 2=completed, 3=uncompleted
+	int asc = false;
 
 	bool HasGoal(const string& ck) { return goalmap.count(ck) == 1; }
 	ScoreGoal& GetLowestGoalForRate(const string& ck, float rate);

src/ScreenNetSelectMusic.cpp

@@ -223,7 +223,6 @@ bool ScreenNetSelectMusic::Input(const InputEventPlus &input)
 			Song* asonglol = m_MusicWheel.GetSelectedSong();
 			asonglol->SetHasGoal(true);
 			MESSAGEMAN->Broadcast("FavoritesUpdated");
-			MESSAGEMAN->Broadcast("UpdateGoals");
 			m_MusicWheel.ChangeMusic(0);
 			return true;
 		}

src/ScreenSelectMusic.cpp

@@ -538,7 +538,6 @@ bool ScreenSelectMusic::Input(const InputEventPlus &input)
 				return true;
 			asonglol->SetHasGoal(true);
 			MESSAGEMAN->Broadcast("FavoritesUpdated");
-			MESSAGEMAN->Broadcast("UpdateGoals");
 			m_MusicWheel.ChangeMusic(0);
 			return true;
 		}

src/XMLProfile.cpp

@@ -422,6 +422,7 @@ XNode* GoalsForChart::CreateNode() const {
 	XNode* cg = new XNode("GoalsForChart");
 
 	if (!goals.empty()) {
+		ASSERT(goals[0].chartkey != "" && goals[0].chartkey != " ");
 		cg->AppendAttr("Key", goals[0].chartkey);
 		FOREACH_CONST(ScoreGoal, goals, sg)
 			cg->AppendChild(sg->CreateNode());
@@ -486,6 +487,10 @@ void XMLProfile::LoadScoreGoalsFromNode(const XNode *pNode) {
 		chgoals->GetAttrValue("Key", ck);
 		ck = SONGMAN->ReconcileBustedKeys(ck);
 		loadingProfile->goalmap[ck].LoadFromNode(chgoals);
+
+		// this should load using the chart system but ensure keys are set properly here for now -mina
+		for (auto& sg : loadingProfile->goalmap[ck].goals)
+			sg.chartkey = ck;
 	}
 }