Skip to content
This repository was archived by the owner on Aug 8, 2019. It is now read-only.

Commit 930b14e

Browse files
committed
Fix conversion
1 parent 341e390 commit 930b14e

File tree

6 files changed

+24
-11
lines changed

6 files changed

+24
-11
lines changed

rails-time-track/app/controllers/api/projects_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ def create
3232
category: params[:category],
3333
start_date: params[:start_date],
3434
end_date: params[:end_date],
35-
estimated_cost: params[:estimated_cost],
35+
estimated_cost: params[:estimated_cost]*100,
3636
real_cost: 0,
3737
closed: false
3838
)
3939
if project.save
4040
if params[:members].all? do |member|
4141
newMember = ProjectMember.new(
4242
user_id: member[:user_id],
43-
estimated_cost: member[:estimated_cost],
43+
estimated_cost: member[:estimated_cost]*100,
4444
real_cost: 0
4545
)
4646
newMember.project_id = project.id

rails-time-track/app/serializers/user_available_time_serializer.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
class UserAvailableTimeSerializer < ActiveModel::Serializer
22
attributes :id, :name, :rate, :availableTime, :isChosen, :role
33

4+
def rate
5+
object.rate/100
6+
end
7+
48
def availableTime
59
params = @instance_options[:option_name]
610
startDate = Date.parse(params[:startDate])

rails-time-track/db/seeds.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#Create projects
6464

6565
project1 = Project.create(
66-
name: "Proyecto 1",
66+
name: "Kampu",
6767
client: "Graña y Montero",
6868
category: "Category 1",
6969
start_date: "2019-07-08",
@@ -74,7 +74,7 @@
7474
)
7575

7676
project2 = Project.create(
77-
name: "Proyecto 2",
77+
name: "Line Balancing",
7878
client: "Interbank Group",
7979
category: "Category 2",
8080
start_date: "2019-07-08",
@@ -85,7 +85,7 @@
8585
)
8686

8787
project3 = Project.create(
88-
name: "Proyecto 3",
88+
name: "Shift me",
8989
client: "Essalud",
9090
category: "Category 3",
9191
start_date: "2019-07-08",
@@ -96,7 +96,7 @@
9696
)
9797

9898
project4 = Project.create(
99-
name: "Proyecto 4",
99+
name: "OverBooking",
100100
client: "Energia y Minas",
101101
category: "Category 1",
102102
start_date: "2019-07-08",
@@ -107,8 +107,8 @@
107107
)
108108

109109
project5 = Project.create(
110-
name: "Proyecto 5",
111-
client: "Banco Mundial",
110+
name: "Codeable App",
111+
client: "Able",
112112
category: "Category 2",
113113
start_date: "2019-07-08",
114114
end_date: "2019-09-30",

react-time-track/src/components/add-member-project.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ function AddMemberProject({ listMember, addMemberFn, closeModalFn }) {
213213
let member = listMember[ddlEmployee.selectedIndex];
214214
let name = member.name;
215215
let time = +event.target.elements.txtTime.value;
216-
let cost = (member.rate * member.availableTime.length * 8 * time) / 100;
216+
let cost =
217+
Math.round(member.rate * member.availableTime.length * 8 * time) / 100;
217218

218219
addMemberFn({ id, name, time, cost });
219220
closeModalFn();

react-time-track/src/components/list-member-project.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ function ListMemberProject({ nextFn, beforeFn }) {
2121

2222
const titleProject = JSON.parse(sessionStorage.getItem("InfoNewProject"))
2323
.title;
24-
const totalCost = listMemberAdded.reduce((sum, elem) => sum + elem.cost, 0);
24+
const totalCost =
25+
Math.round(
26+
listMemberAdded.reduce((sum, elem) => sum + elem.cost, 0) * 100
27+
) / 100;
2528

2629
function addMember(newMember) {
2730
let index = listMember.findIndex(element => element.id === newMember.id);

react-time-track/src/contexts/user.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ function UserProvider({ children }) {
1515

1616
const onLogin = userData => setLoggedIn(userData);
1717
const onLogout = () => {
18-
logout().then(() => setLoggedIn(null));
18+
logout()
19+
.then(() => setLoggedIn(null))
20+
.catch(response => {
21+
console.log(response);
22+
setLoggedIn(null);
23+
});
1924
};
2025

2126
const value = {

0 commit comments

Comments
 (0)