[IMP] Iproved view and css

bzr revid: tpa@tinyerp.com-20130524125739-2h9etthwlb80qeub

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4cde91b..23d7ecb 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -381,28 +381,29 @@
                                         </div>
                                     </div>
                                     <t t-if="record.state.raw_value == 'recruit'">
-                                        <div class="oe_application">
+                                        <div class="oe_applications">
                                             <a name="%(hr_job_applications)d" type="action" >
-                                                <div t-if="record.application_count.value gt 1" ><t t-esc="record.application_count.value"/> Applications</div>
-                                                <div t-if="record.application_count.value lt 2" ><t t-esc="record.application_count.value"/> Application</div>
+                                                <div t-if="record.application_count.value gt 1"><t t-esc="record.application_count.value"/> Applications</div>
+                                                <div t-if="record.application_count.value lt 2"><t t-esc="record.application_count.value"/> Application</div>
                                             </a>
                                         </div>
-                                        <div style="margin-top: 6px;color: #4c4c4c;"><t t-esc="Math.round(record.no_of_recruitment.raw_value)"/> Expected New Employees</div>
+                                        <div class="oe_new_recruitment">
+                                            <div t-if="record.no_of_recruitment.raw_value gt 1"><t t-esc="record.no_of_recruitment.raw_value"/> Expected New Employees</div>
+                                            <div t-if="record.no_of_recruitment.raw_value lt 2"><t t-esc="record.no_of_recruitment.raw_value"/> Expected New Employee</div>
+                                        </div>
                                         <field state="recruit" name="no_of_recruitment" widget="gage" style="width:167px; height: 102px;" options="{'min_field': 'no_of_hired_employee','max_field': 'no_of_recruitment', 'label_field': 'no_of_hired_employee', 'action_change': 'action_hired_employee'}">Forecast</field>
                                     </t>
-                                    <div class="oe_kanban_footer_left oe_job_message">
-                                        <t t-raw="record.message_summary.raw_value"/>
-                                    </div>
                                     <t t-if="record.state.raw_value == 'open'">
                                         <div class="oe_start_recruitment">
                                             <p>To start a recruitment phase for this job position,<b>click here</b></p>
                                             <img src="/hr_recruitment/static/src/img/down1.png"/>
                                         </div>
                                     </t>
-                                    <div class="oe_job_launch">
-                                        <a t-if="record.survey_id.raw_value" data-name="action_print_survey" data-type="object" class=" oe_kanban_action oe_kanban_action_a">Print Interview | </a>
-                                        <a t-if="record.state.raw_value == 'open'" data-name="job_recruitment" data-type="object" class=" oe_kanban_action oe_kanban_action_a ">Launch Recruitment</a>
-                                        <a t-if="record.state.raw_value == 'recruit'" data-name="job_open" data-type="object" class=" oe_kanban_action oe_kanban_action_a ">Recruitment Done</a>
+                                    <div class="oe_launch_recruitment">
+                                        <a t-if="record.survey_id.raw_value" data-name="action_print_survey" data-type="object" class="oe_kanban_action">Print Interview</a>
+                                        <a t-if="record.survey_id.raw_value"> | </a>
+                                        <a t-if="record.state.raw_value == 'open'" data-name="job_recruitment" data-type="object" class="oe_kanban_action">Launch Recruitment</a>
+                                        <a t-if="record.state.raw_value == 'recruit'" data-name="job_open" data-type="object" class="oe_kanban_action">Recruitment Done</a>
                                     </div>
                                 </div>
                             </div>

diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css
index ace9af4..ef744b3 100644 (file)
--- a/addons/hr_recruitment/static/src/css/job_position.css
+++ b/addons/hr_recruitment/static/src/css/job_position.css
@@ -1,28 +1,30 @@
+.openerp .oe_kanban_job{
+    width: 275px;
+    min-height: 147px !important;
+}
 .openerp .oe_job {
     font-size:112%;
     margin:3px 3px;
     margin-left: 45px;
     color: #4c4c4c;
 }
-.openerp .oe_job_message {
-    float: right;
-    margin-right: 80px;
-    margin-top: -4px !important;
-}
 .openerp img.oe_kanban_avatar {
     margin-top: -23px;
     width:38px;
     height:38px;
 }
-.openerp div.oe_kanban_ellipsis {
-    width:180px;
-}
-.openerp .oe_job_launch > a:hover {
-    text-decoration: underline
+.openerp .oe_launch_recruitment{
+    float: right;
+    position: absolute;
+    bottom: 3px;
+    right: 10px;
 }
-.openerp div.oe_application {
+.openerp div.oe_applications {
     margin-top: 24px;
 }
+.openerp .oe_applications > a > div:hover {
+    text-decoration: underline
+}
 .openerp .oe_name {
     margin-left: 44px;
     margin-top: -18px;
@@ -30,32 +32,10 @@
     font-size: 11px;
     color: gray;
 }
-.openerp .oe_kanban_job{
-    width: 275px;
-    min-height: 147px !important;
-}
-.openerp .oe_kanban_footer_right {
-    float: right;
-}
-.openerp .oe_kanban_draghandle {
-    height: 114px;
-}
-.openerp .oe_kanban_footer_right{
-    width: 220px;
-}
-.openerp .link{
-    float:right;
-}
-.openerp .oe_job_launch{
-    float: right;
-    position: absolute;
-    bottom: 3px;
-    right: 10px;
-}
 .openerp .oe_department {
     display: inline-block;
 }
-.openerp .oe_new_emp {
+.openerp .oe_new_recruitment {
     margin-top: 6px;
     color: #4c4c4c;
 }

diff --git a/addons/hr_recruitment/static/src/js/job_position.js b/addons/hr_recruitment/static/src/js/job_position.js
index eecd7e4..d6668dd 100644 (file)
--- a/addons/hr_recruitment/static/src/js/job_position.js
+++ b/addons/hr_recruitment/static/src/js/job_position.js
@@ -3,12 +3,11 @@ openerp.hr_recruitment = function (openerp) {
   openerp.hr_recruitment.GaugeWidget = openerp.web_kanban.AbstractField.extend({
     start: function() {
         var self = this;
-        
         var parent = self.getParent();
         var unique_id = _.uniqueId("JustGage");
         var label = this.options.label_field ? parent.record[this.options.label_field].string : "";
         var value = parent.values.no_of_hired_employee.value;
-        //var min_value = parent.no_of_employee.value;
+        var flag_open = false;
         this.$el.empty()
             .attr('style', this.$node.attr('style') + ';float: right;margin-top: -84px;margin-right: -31px;')
             .attr('id', unique_id);
@@ -31,7 +30,6 @@ openerp.hr_recruitment = function (openerp) {
                 "#a9d70b"
             ],
         });
-                var flag_open = false;
         if (self.options.action_change) {
             self.$el.click(function (event) {
                 event.stopPropagation();
@@ -53,9 +51,7 @@ openerp.hr_recruitment = function (openerp) {
                                     parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
                                         parent.do_reload();
                                     });
-                                } else {
-                                    $div.remove();
-                                }
+                                } else { $div.remove();}
                             }
                         })
                         .click(function (event) {