Merge pull request #8 from god-of-ghz/v1.8

V1.8

Author: god-of-ghz

QCML Inventory V1.8.4.exe

@@ -222,3 +222,47 @@ o	Lot histories are not saved and are rebuilt each time one is desired
 -	Added functionality: ‘find’ can now edit a group of materials after the desired list has been generated
 o	Essentially allows for a ‘mass edit’ feature
 -	Updated menu heading
+
+ V1.8 1/7/2015
+-	New function! ‘usage’ or ‘monthly’ provides a powder usage history for the current month
+o	User enters ‘usage’ at the main menu and usage is automatically calculated and exported as a report, similar to ‘lot history’
+o	Currently only works for the current, cannot be done for a month in the past
+-	Changed the ‘recent’ function to only clear if 500 entries are made
+-	Added functionality: editing a group of materials in ‘find’ will now add them to ‘recent’
+-	Added functionality: listing results in ‘find’ also gives the total weight without having to write a report every time
+-	Added functionality: searching for materials in ‘find’ will automatically search for partial matches if no complete matches are found
+o	Partial matches are only searched for during new searches
+o	Refining a search will not seek partial matches
+o	A partial match is one where the user input is found as fragment of the actual term, or vice versa.
+o	Eg. Searching for ‘steel’ would return partial matches for ‘stainless_steel’ ‘maraging_steel’ and ‘chrome_steel’
+o	Eg. Searching for ‘nickel_iron’ would return partial matches for ‘nickel’ and ‘iron,’ but NOT ‘nickel_steel’ or ‘nickel_chrome’
+o	One of the terms must appear COMPLETELY in the other to return match
+-	Updated help menu
+-	Updated menu heading
+-	Re-enabled hidden experimental function, used for debugging only
+o	Accessed via command ‘beta’
+-	Bug fixes:
+o	Whenever a date is entered by the user, the program will thoroughly check to be sure it is a valid date in the proper format
+o	The program will not incorrectly add a material to ‘recent’ if the edit never went through
+V1.8.1 2/6/2015
+-	‘search’ now displays its results in a neater table format
+-	Fixed a bug where inventorying a new item and using it in the same month would report no usage
+V1.8.2 2/17/2015
+-	Updated menu heading
+-	Added functionality: ‘monthly usage’ now prints out the report on the screen as well as writing it to the file
+-	Added functionality: ‘recent’ now gives a preview of the total weight, instead of having the print the report to see it
+-	Added functionality: ‘monthly usage’ now tallies up power gained and powder lost in the monthly report, instead of giving just net usage
+-	Added functionality: whenever a number is entered for a weight, the program checks to ensure it is an actual number before continuing, preventing commands or nonsensical entries accidentally being entered as weights
+-	Writing any report now puts the written text report in a folder called ‘reports,’ instead of putting them directly in the program’s files
+V1.8.3 3/4/2015
+-	Added functionality: ‘search’ now also adds up the total weight of the powder containers being scanned
+o	Now only prompts the user to enter a barcode once at the start, instead of each time.
+-	Updated menu heading
+
+V1.8.4 4/16/2015
+-	When a contained of powder is edited for weight (meaning the weight has changed) the program will now also automatically mark it as being opened
+-	Added a hidden command at the main menu “fix_all”
+o	Runs through the list of powder in inventory
+o	Any entry with more than 1 instance of history (i.e the weight has ever changed) will be set to ‘1’ or be marked as opened
+o	Displays the number of entries changed
+-	Updated menu heading

README.md

@@ -11,6 +11,7 @@ using namespace std;
 int process_date1(string target);		//converts a string date of the form MMDDYYYY to an integer that can be numerically compared
 string process_date2(int target);		//converts that integer used for comparison back to its original form			
 
+
 class Lots {
 	string lotID;
 	vector <int> index_list;
@@ -22,6 +23,9 @@ class Lots {
 	string own;
 	string size;
 
+	double used;
+	double gained;
+
 public:
 	Lots() { return; }
 	Lots(Materials target);
@@ -53,19 +57,27 @@ class Lots {
 	string get_own() const { return own; }
 	string get_size() const { return size; }
 
+	double get_usage() const { return used; }
+	double get_gained() const { return gained; }
+
 	vector <int> get_indices() const { return index_list; }
 	vector <string> get_dates() const { return dates; }
 	vector <double> get_weights() const { return weights; }
 
 	bool is_used(string date);
 	bool is_used(Materials target, vector <Materials> &thelist);
 
+	void usage(string date);
+
 	void clear();
 	void clear_all();
 
 
 };
 
+bool is_same_month(string target, string a);
+bool used_recently(Lots a);
+
 Lots::Lots(Materials target) {
 	lotID = target.get_lot();
 	name = target.get_name();
@@ -97,6 +109,7 @@ void Lots::rebuild(vector <Materials> &thelist) {
 	build_list(thelist);
 	build_dates(thelist);
 	build_weights(thelist);
+	usage(currentDate());
 }
 
 void Lots::operator= (const Lots &target) {
@@ -182,19 +195,6 @@ void Lots::build_weights(vector <Materials> &thelist) {
 		current_date = dates[i];
 		runsum = 0;
 		for (int j = 0; j < index_list.size(); j++) {
-			/*if (thelist[index_list[j]].h_size() > date_index) {
-				if (thelist[index_list[j]].get_dhist(date_index) == current_date) {
-					runsum = runsum + stod(thelist[index_list[j]].get_whist(date_index));
-				}
-				else {
-					for (int k = 0; k <= date_index; k++) {
-						if (process_date1(thelist[index_list[j]].get_dhist(date_index - k)) < process_date1(current_date)) {
-							runsum = runsum + stod(thelist[index_list[j]].get_whist(date_index - k));
-							break;
-						}
-					}
-				}
-			}*/
 			for (int k = thelist[index_list[j]].h_size() - 1; k >= 0; k--) {
 				if (process_date1(thelist[index_list[j]].get_dhist(k)) <= process_date1(current_date)) {
 					runsum = runsum + stod(thelist[index_list[j]].get_whist(k));
@@ -284,6 +284,79 @@ bool Lots::is_used(Materials target, vector <Materials> &thelist) {
 	return false;
 }
 
+void Lots::usage(string date) {
+	double finish, start;
+	double previous, next;
+	double used_runsum = 0;
+	double gain_runsum = 0;
+	int index = 0;
+	if (is_same_month(dates[0], currentDate())) {
+		previous = 0;
+	}
+	else {
+		for (int i = dates.size() - 1; i >= 0; i--) {
+			if (!is_same_month(dates[i], currentDate())) {
+				previous = weights[i];
+				index = i;
+				break;
+			}
+		}
+	}
+	for (int i = index; i < weights.size(); i++) {
+		next = weights[i];
+		if (previous <= next) {
+			gain_runsum = gain_runsum + (next - previous);
+		}
+		else {
+			used_runsum = used_runsum + (previous - next);
+		}
+		previous = weights[i];
+	}
+
+	gained = gain_runsum;
+	used = used_runsum;
+}
+
+bool is_same_month(string target, string a) {
+	string num = "0123456789";
+	string start = "01";
+	string end;
+	string firstofmonth;
+	string lastofmonth;
+	string year;
+	string month;
+	year.append(a, 4, 4);
+	month.append(a, 0, 2);
+	if (a[0] == num[0]) {
+		if (a[1] == num[1] || a[1] == num[3] || a[1] == num[5] || a[1] == num[7] || a[1] == num[8])
+			end = "31";
+		else if (a[1] == num[4] || a[1] == num[6] || a[1] == num[9])
+			end = "30";
+		else if (a[1] == num[2]) {
+			if (stoi(year) % 4 == 0)
+				end = "29";
+			else
+				end = "28";
+		}
+	}
+	else if (a[0] == num[1]) {
+		if (a[0] == num[0] || a[0] == num[2])
+			end = "31";
+		else if (a[0] == num[1])
+			end = "30";
+	}
+	firstofmonth.append(month), lastofmonth.append(month);
+	firstofmonth.append(start), lastofmonth.append(end);
+	firstofmonth.append(year), lastofmonth.append(year);
+
+	return (process_date1(firstofmonth) <= process_date1(target) && process_date1(target) <= process_date1(lastofmonth));
+}
+
+bool used_recently(Lots a) {
+	return is_same_month(a.get_dates()[a.get_weights().size() - 1], currentDate());
+}
+
+
 void Lots::clear() {
 	index_list.clear();
 	dates.clear();