Add user role on project creation, user rate on edit and minor bug

Author: diegotc86

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

@@ -20,7 +20,9 @@ def show
     end
 
     def update
+      @user.update(user_params)
       if @user.update(user_params)
+        @user.update(rate: @user.rate*100)
         render json: @user, status: :ok
       else
         render_errors(@user.errors.full_messages.join("\n"), :unprocessable_entity)

rails-time-track/app/models/user.rb

@@ -38,7 +38,7 @@ def reset_token_expired?
   def availableTimeRange(startDate, endDate)
     workingDaysRange = (startDate..endDate).filter {|d| (1..5).include?(d.wday) }
     listProjectAssigned = self.project_members.includes(:project)
-    return Array.new(workingDaysRange.length, 100) if projects.size == 0
+    return Array.new(workingDaysRange.length, 100) if listProjectAssigned.size == 0
 
     listTimeByProject = listProjectAssigned.map do |project|
       projectTimeRange = (project.project.start_date..project.project.end_date).filter {|d| (1..5).include?(d.wday) }

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

@@ -1,5 +1,5 @@
 class UserAvailableTimeSerializer < ActiveModel::Serializer
-  attributes :id, :name, :rate, :availableTime, :isChosen
+  attributes :id, :name, :rate, :availableTime, :isChosen, :role
 
   def availableTime
     params = @instance_options[:option_name]

rails-time-track/db/seeds.rb

@@ -3,23 +3,23 @@
 #Create users
 
   owner = User.create(
-    name: "Diego Owner",
+    name: "Diego",
     email: "diegotc86@gmail.com",
     password: "123456",
     role: "Owner",
     rate: 6200
   )
 
   manager1 = User.create(
-    name: "Brayan Manager",
+    name: "Brayan",
     email: "linzeur@hotmail.com",
     password: "123456",
     role: "Manager",
     rate: 4300
   )
 
   manager2 = User.create(
-    name: "Frank Manager",
+    name: "Frank",
     email: "manager2@mail.com",
     password: "123456",
     role: "Manager",
@@ -28,31 +28,31 @@
   )
 
   analyst1 = User.create(
-    name: "Jonathan Analyst",
+    name: "Jonathan",
     email: "jcmendozar10@gmail.com",
     password: "123456",
     role: "Analyst",
     rate: 1200
   )
 
   analyst2 = User.create(
-    name: "Lian Analyst",
+    name: "Lian",
     email: "analyst2@mail.com",
     password: "123456",
     role: "Analyst",
     rate: 1100
   )
 
   analyst3 = User.create(
-    name: "Carlos Analyst",
+    name: "Carlos",
     email: "analyst3@mail.com",
     password: "123456",
     role: "Analyst",
     rate: 1150
   )
 
   analyst4 = User.create(
-    name: "Carmen Analyst",
+    name: "Carmen",
     email: "analyst4@mail.com",
     password: "123456",
     role: "Analyst",
@@ -341,7 +341,7 @@
           DailyLog.create(
             project_member: member,
             date: day.to_s,
-            amount: (member.estimated_cost / duration * rand(0.75..1.75)).to_i
+            amount: (member.estimated_cost / duration * rand(0..1.85)).to_i
           )
         end
       }
@@ -360,7 +360,7 @@
           DailyLog.create(
             project_member: member,
             date: day.to_s,
-            amount: (member.estimated_cost / duration * rand(0.75..1.75)).to_i
+            amount: (member.estimated_cost / duration * rand(0..1.85)).to_i
           )
         end
       }

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

@@ -246,7 +246,7 @@ function AddMemberProject({ listMember, addMemberFn, closeModalFn }) {
               >
                 {listMember.map(value => (
                   <option value={value.id} key={value.id}>
-                    {value.name}
+                    {`${value.name} (${value.role})`}
                   </option>
                 ))}
               </select>

react-time-track/src/views/edit-user.js

@@ -19,7 +19,10 @@ function EditUser({ user_id }) {
   });
 
   React.useEffect(() => {
-    getUser(user_id).then(data => setUser(data));
+    getUser(user_id).then(data => {
+      data.rate /= 100;
+      setUser(data);
+    });
   }, []);
 
   function handleSubmit(e) {