Merge branch 'master' of http://giugl.io:10000/peperunas/swing2

2.Design Document/DD.lyx

@@ -4074,7 +4074,7 @@ In this section we will analyze the structure of the code that will handle
 \end_layout
 
 \begin_layout Subparagraph*
-calculateRentDiscount(Rent, float)
+calculateRentDiscount(Rent)
 \end_layout
 
 \begin_layout Standard
@@ -4110,7 +4110,7 @@ begin{lstlisting}
 
 \begin_layout Plain Layout
 
-float function calculateRentDiscount(Rent ren, float totalCost){
+void function calculateRentDiscount(Rent ren){
 \end_layout
 
 \begin_layout Plain Layout
@@ -4130,7 +4130,7 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-		actualCost = actualCost * 0.9;
+		ren.totalCost *= 0.9;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4160,7 +4160,7 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-		actualCost = actualCost * 0.8;
+		ren.totalCost *= 0.8;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4206,7 +4206,7 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-			actualCost = actualCost * 0.6;
+			ren.totalCost *= 0.6;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4228,7 +4228,7 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-			actualCost = actualCost * 0.7;
+			ren.totalCost *= 0.7;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4264,7 +4264,7 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-			actualCost = actualCost * 0.7;
+			ren.totalCost *= 0.7;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4284,15 +4284,6 @@ float function calculateRentDiscount(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-\end_layout
-
-\begin_layout Plain Layout
-
-	return totalCost;
-\end_layout
-
-\begin_layout Plain Layout
-
 }
 \end_layout
 
@@ -4313,7 +4304,7 @@ end{lstlisting}
 \end_layout
 
 \begin_layout Subparagraph*
-calculateAdditionalFee(Rent, float)
+calculateAdditionalFee(Rent)
 \end_layout
 
 \begin_layout Standard
@@ -4349,11 +4340,7 @@ begin{lstlisting}
 
 \begin_layout Plain Layout
 
-float function calculateAdditionalFee(Rent ren, float totalCost){
+void function calculateAdditionalFee(Rent ren){
-\end_layout
-
-\begin_layout Plain Layout
-
 \end_layout
 
 \begin_layout Plain Layout
@@ -4379,7 +4366,7 @@ float function calculateAdditionalFee(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-		actualCost = actualCost * 1.3;
+		ren.totalCost *= 1.3;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4394,15 +4381,6 @@ float function calculateAdditionalFee(Rent ren, float totalCost){
 
 \begin_layout Plain Layout
 
-\end_layout
-
-\begin_layout Plain Layout
-
-return totalCost;
-\end_layout
-
-\begin_layout Plain Layout
-
 }
 \end_layout
 
@@ -4472,22 +4450,7 @@ function calculateRentFees (Rent ren){
 
 \begin_layout Plain Layout
 
-	
+	ren.totalCost = ren.report.totalTime * ren.report.pricePerMinute;
-\end_layout
-
-\begin_layout Plain Layout
-
-	float totalCost = 0.0;
-\end_layout
-
-\begin_layout Plain Layout
-
-	
-\end_layout
-
-\begin_layout Plain Layout
-
-	totalCost = ren.report.totalTime * ren.report.pricePerMinute;
 \end_layout
 
 \begin_layout Plain Layout
@@ -4504,7 +4467,7 @@ function calculateRentFees (Rent ren){
 
 \begin_layout Plain Layout
 
-	totalCost = calculateRentDiscount(ren, totalCost);
+	calculateRentDiscount(ren);
 \end_layout
 
 \begin_layout Plain Layout
@@ -4518,7 +4481,7 @@ function calculateRentFees (Rent ren){
 
 \begin_layout Plain Layout
 
-	totalCost = calulateAdditionalFee(ren, totalCost);
+	calculateAdditionalFee(ren);
 \end_layout
 
 \begin_layout Plain Layout
@@ -4532,7 +4495,7 @@ function calculateRentFees (Rent ren){
 
 \begin_layout Plain Layout
 
-	paymentHandler(ren.User, totalCost);
+	paymentHandler(ren.User, ren.totalCost);
 \end_layout
 
 \begin_layout Plain Layout