[Fmsystem-commits] [12436] Syncromind: Merge 12406:12435 from trunk

[Sigurd Nes]

Revision: 12436
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12436
Author:   sigurdne
Date:     2014-12-10 21:52:50 +0000 (Wed, 10 Dec 2014)
Log Message:
-----------
Syncromind: Merge 12406:12435 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.sotts.inc.php
    branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_validate.js

Property Changed:
----------------
    branches/dev-syncromind/


Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:12111-12211,12213-12246,12250-12363,12366-12405
   + /trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435

Modified: branches/dev-syncromind/property/inc/class.sotts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sotts.inc.php    2014-12-10 
21:48:20 UTC (rev 12435)
+++ branches/dev-syncromind/property/inc/class.sotts.inc.php    2014-12-10 
21:52:50 UTC (rev 12436)
@@ -403,7 +403,7 @@
                                {
                                        $end_period     = date('Ym', $end_date);
                                        $start_period   = date('Ym', 
$start_date);
-                                       $date_join = " LEFT OUTER JOIN 
fm_tts_payments ON ( fm_tts_tickets.id=fm_tts_payments.ticket_id AND 
fm_tts_payments.period >= $start_period AND fm_tts_payments.period <= 
$end_period )";
+                                       $date_join = "JOIN fm_tts_payments ON ( 
fm_tts_tickets.id=fm_tts_payments.ticket_id AND fm_tts_payments.period >= 
$start_period AND fm_tts_payments.period <= $end_period )";
                                        $actual_cost_field = 
'SUM(fm_tts_payments.amount) AS actual_cost';
                                        $actual_cost_group_field = '';
                                }

Modified: 
branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_validate.js
===================================================================
--- branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_validate.js 
2014-12-10 21:48:20 UTC (rev 12435)
+++ branches/dev-syncromind/property/inc/custom/default/ticket_NLSH_validate.js 
2014-12-10 21:52:50 UTC (rev 12436)
@@ -1,48 +1,58 @@
 
 $(document).ready(function()
 {
-       show_feilkoder();
+       show_feiltyper();
 
        $("#global_category_id").change(function()
        {
-               show_feilkoder();
+               show_feiltyper();
        });
 
 });
 
-function show_feilkoder()
+function show_feiltyper()
 {
-       if ($("#global_category_id").val() == 20)
+       switch($("#global_category_id").val())
        {
-               document.getElementById('label_feilkoder').style.display = 
'block';
-               document.getElementById('id_feilkoder').style.display = 'block';
+               case 154: //Brann &amp; sikkerhet
+               case 21: //Feilmelding
+               case 74: // Garanti
+               case 176: // title="Periodisk vedlikehold
+                       
document.getElementById('label_feiltyper').style.display = 'block';
+                       document.getElementById('id_feiltyper').style.display = 
'block';
+                       break;
+               default:
+                       
document.getElementById('label_feiltyper').style.display = 'none';
+                       document.getElementById('id_feiltyper').style.display = 
'none';
        }
-       else
-       {
-               document.getElementById('label_feilkoder').style.display = 
'none';
-               document.getElementById('id_feilkoder').style.display = 'none';
-       }
+}
 
-}
 function validate_submit()
 {
        var error = false;
-       var feilkode_id = $("#id_feilkoder").val();
+       var feiltype_id = $("#id_feiltyper").val();
        var category_id = $("#global_category_id").val();
-       var group_id = $("#global_category_id").val();
+//     var group_id = $("#global_category_id").val();
        var status_id = $("#status_id").val();
 
-       if (category_id == 20)
+       switch(category_id)
        {
-               if (!feilkode_id && status_id == 'X')
-               {
-                       error = true;
-               }
+               case 154: //Brann &amp; sikkerhet
+               case 21: //Feilmelding
+               case 74: // Garanti
+               case 176: // title="Periodisk vedlikehold
+                       if (!feiltype_id && status_id == 'X')
+                       {
+                               error = true;
+                       }
+                       break;
+               default:
        }
 
+
        if (error)
        {
-               alert('Feilkode må velges før meldingen kan avsluttes');
+               alert('Feiltype må velges før meldingen kan avsluttes');
        }
        else
        {