refactor method selected_date

app/assets/stylesheets/admin.scss

@@ -10,10 +10,7 @@
   border: 1px solid #ced4da;
   border-radius: 0.25rem;
   height: 40px;
-  padding-top: 0.375rem;
-  padding-right: 0.75rem;
-  padding-bottom: 0.375rem;
-  padding-left: 0.6rem;
+  padding: 0.375rem 0.75rem 0.375rem 0.6rem;
 }
 @mixin admin_select__child {
   border: none;
@@ -28,12 +25,10 @@
     outline: none;
   }
 }
-.admin_box_search__filter_city_id {
-  @include admin_select()
-}
-.admin_box_search__filter_industry_id {
+.admin_box_search__filter_city_id, .admin_box_search__filter_industry_id {
   @include admin_select()
 }
+
 .admin_box_search__filter_date {
   @include admin_select();
   border: none !important;
@@ -48,17 +43,15 @@
     }
   }
 }
-.admin_box_search__filter_date__past_time {
-  width: 100%;
-  text-align: center;
-}
-.admin_box_search__filter_date__current_time {
+.admin_box_search__filter_date__past_time, .admin_box_search__filter_date__current_time {
   width: 100%;
   text-align: center;
 }
+
 .admin_box_search__btn {
   margin-top: 10px;
 }
+
 .admin_box_search__download {
   width: 100%;
   text-align: right;
@@ -71,11 +64,7 @@
 .btn-admin-search {
   width: 100%;
 }
-#apply_city_id {
-  @include admin_select__child()
-}
-
-#apply_industry_id {  
+#apply_city_id, #apply_industry_id {
   @include admin_select__child()
 }
 

app/forms/apply.rb

@@ -11,13 +11,20 @@ class Apply
 
   def self.selected_date(params)
     dt = {}
-    dt[:selected_past_year] = params.present? ?  params['past_time(1i)'].to_i : Date.current.year
-    dt[:selected_past_month] = params.present? ? params['past_time(2i)'].to_i : Date.current.month
-    dt[:selected_past_day] = params.present? ? params['past_time(3i)'].to_i : Date.current.day
+    if params.present?
+      debugger
+      dt[:selected_past_year] = params['past_time(1i)'].to_i
+      dt[:selected_past_month] = params['past_time(2i)'].to_i
+      dt[:selected_past_day] = params['past_time(3i)'].to_i
 
-    dt[:selected_current_year] = params.present? ? params['current_time(1i)'].to_i : Date.current.year
-    dt[:selected_current_month] = params.present? ? params['current_time(2i)'].to_i : Date.current.month
-    dt[:selected_current_day] = params.present? ? params['current_time(3i)'].to_i : Date.current.day
+      dt[:selected_current_year] = params['current_time(1i)'].to_i
+      dt[:selected_current_month] = params['current_time(2i)'].to_i
+      dt[:selected_current_day] = params['current_time(3i)'].to_i
+    else
+      dt[:selected_past_year] = dt[:selected_current_year] = Date.current.year
+      dt[:selected_past_month] = dt[:selected_current_month] = Date.current.month
+      dt[:selected_past_day] = dt[:selected_current_day] = Date.current.day
+    end
     dt
   end
 end