Fix: revised code

src/game/license_timer/license_data_manager.js

@@ -1,28 +1,30 @@
 function LicenseCompanySubjectData(companyName, subjectName, timeLimit, maxScore, gradeList) {
 	this.companyName = companyName;
 	this.subjectName = subjectName;
+	this.subjectFullname = companyName + " " + subjectName;
 	this.timeLimit = timeLimit;
 	this.maxScore = maxScore;
 	this.gradeList = gradeList;
 }
 
-LicenseCompanySubjectData.prototype.isNameOf = function(companySubjectName) {
-	var name = this.companyName + " " + this.subjectName;
-	if(name == companySubjectName)
-		return true;
+LicenseCompanySubjectData.prototype.getGrade = function(score) {
+	var count = this.gradeList.length;
+	for(var i = 0; i < count; i++) {
+		if(score >= this.gradeList[i].score)
+			return this.gradeList[i].grade;
+	}
 
-	return false;
+	return "-";
 }
 
-
 function LicenseDataManager() {
-	this.licenseCompanies = [];
-	this.licenseSubjects = [];
+	this.companies = [];
+	this.subjects = [];
 
 	// console.log(licenseCompanySubjectList);
 	this.maxSubjectCount = 0;
 	for(var i = 0; i < licenseCompanySubjectList.length; i++) {
-		this.licenseCompanies[i] = licenseCompanySubjectList[i].companyName;
+		this.companies[i] = licenseCompanySubjectList[i].companyName;
 
 		var subjectCount = 0;
 		var companyData = licenseCompanySubjectList[i];
@@ -35,14 +37,14 @@ function LicenseDataManager() {
 
 			for(var k = 0; k < subjectList.length; k++) {
 				var licenseCompnaySubjectItem = new LicenseCompanySubjectData(
-					this.licenseCompanies[i],
+					this.companies[i],
 					subjectList[k],
 					companyData.subjectData[j].timeLimit,
 					companyData.subjectData[j].maxScore,
 					companyData.subjectData[j].gradeList
 				);
 
-				this.licenseSubjects.push(licenseCompnaySubjectItem);
+				this.subjects.push(licenseCompnaySubjectItem);
 
 			}
 		}
@@ -51,14 +53,14 @@ function LicenseDataManager() {
 			this.maxSubjectCount = subjectCount;
 	}
 
-	// console.log(this.licenseCompanies);
-	// console.log(this.licenseSubjects);
+	// console.log(this.companies);
+	// console.log(this.subjects);
 	// console.log(this.maxSubjectCount);
 }
 
 
 LicenseDataManager.prototype.getCompanyCount = function() {
-	return this.licenseCompanies.length;
+	return this.companies.length;
 }
 
 LicenseDataManager.prototype.getCompanyList = function() {
@@ -66,12 +68,12 @@ LicenseDataManager.prototype.getCompanyList = function() {
 }
 
 LicenseDataManager.prototype.getCompanyName = function(index) {
-	return this.licenseCompanies[index];
+	return this.companies[index];
 }
 
 LicenseDataManager.prototype.hasCompany = function(companyName) {
-	for(var i = 0; i < this.licenseCompanies.length; i++) {
-		if(this.licenseCompanies[i].companyName == companyName)
+	for(var i = 0; i < this.companies.length; i++) {
+		if(this.companies[i].companyName == companyName)
 			return true;
 	}
 
@@ -79,25 +81,25 @@ LicenseDataManager.prototype.hasCompany = function(companyName) {
 }
 
 LicenseDataManager.prototype.getSubjectCount = function() {
-	return this.licenseSubjects.length;
+	return this.subjects.length;
 }
 
 LicenseDataManager.prototype.getSubjectDataByIndex = function(index) {
-	return this.licenseSubjects[index];
+	return this.subjects[index];
 }
 
-LicenseDataManager.prototype.getSubjectDataByName = function(companySubjectName) {
-	for(var i = 0; i < this.licenseSubjects.length; i++) {
-		var subjectData = this.licenseSubjects[i];
-		if(subjectData.isNameOf(companyName))
+LicenseDataManager.prototype.getSubjectDataByName = function(subjectFullname) {
+	for(var i = 0; i < this.subjects.length; i++) {
+		var subjectData = this.subjects[i];
+		if(subjectData.subjectFullname == subjectFullname)
 			return subjectData;
 	}
 
 	return null;
 }
 
-LicenseDataManager.prototype.getGrade = function(companySubjectName, score) {
-	var companySubjectData = this.getCompanySubjectData(companySubjectName);
+LicenseDataManager.prototype.getGrade = function(subjectData) {
+	var companySubjectData = this.getCompanySubjectData(subjectName);
 	console.log(companySubjectData);
 	// if(companySubjectData != null) {
 	// 	if(score > companySubjectData.gradeList[0].)