[Fmsystem-commits] [12006] property: custom js

[Sigurd Nes]

Revision: 12006
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12006
Author:   sigurdne
Date:     2014-06-05 08:40:52 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------
property: custom js

Modified Paths:
--------------
    trunk/property/inc/custom/default/ticket_NLSH_validate.js
    trunk/property/js/yahoo/tts.view.js
    trunk/property/templates/base/group_select.xsl
    trunk/property/templates/base/tts.xsl

Modified: trunk/property/inc/custom/default/ticket_NLSH_validate.js
===================================================================
--- trunk/property/inc/custom/default/ticket_NLSH_validate.js   2014-06-04 
13:37:28 UTC (rev 12005)
+++ trunk/property/inc/custom/default/ticket_NLSH_validate.js   2014-06-05 
08:40:52 UTC (rev 12006)
@@ -1,38 +1,27 @@
 
-function validate_save()
+function validate_submit()
 {
-       alert($("#id_feilkoder").val());
-}
+       var error = false;
+       var feilkode_id = $("#id_feilkoder").val();
+       var category_id = $("#global_category_id").val();
+       var group_id = $("#global_category_id").val();
+       var status_id = $("#status_id").val();  
 
-$(document).ready(function(){
-
-//id_feilkoder
-       $("#form").on("submit", function(e){
-
-               var error = false;
-               if( !$("#id_konf_1").prop('checked') && 
(!$("#id_konf_2").prop('checked') && !$("#id_konf_3").prop('checked') && 
!$("#id_konf_4").prop('checked')))
+       if(category_id == 20)
+       {
+               if (!feilkode_id && status_id == 'X')
                {
                        error = true;
-                       alert('Du må angi kriterie for 
Konfidensialitetsvurdering');
                }
+       }
 
-               if( !$("#id_integritet_1").prop('checked') && 
(!$("#id_integritet_2").prop('checked') && 
!$("#id_integritet_3").prop('checked') && 
!$("#id_integritet_4").prop('checked')))
-               {
-                       error = true;
-                       alert('Du må angi kriterie for Integritetsvurdering');
-               }
+       if(error)
+       {
+               alert('Feilkode må velges før meldingen kan avsluttes');
+       }
+       else
+       {
+               document.form.submit();
+       }
+}
 
-               if( !$("#id_tilgjengelighet_1").prop('checked') && 
(!$("#id_tilgjengelighet_2").prop('checked') && 
!$("#id_tilgjengelighet_3").prop('checked') && 
!$("#id_tilgjengelighet_4").prop('checked')))
-               {
-                       error = true;
-                       alert('Du må angi kriterie for 
Tilgjengelighetsvurdering');
-               }
-
-               if(error)
-               {
-                       e.preventDefault();
-                       return;
-               }
-       });
-
-});

Modified: trunk/property/js/yahoo/tts.view.js
===================================================================
--- trunk/property/js/yahoo/tts.view.js 2014-06-04 13:37:28 UTC (rev 12005)
+++ trunk/property/js/yahoo/tts.view.js 2014-06-05 08:40:52 UTC (rev 12006)
@@ -44,7 +44,7 @@
                                                                        
document.getElementById(action).value = 1;
                                                                        try
                                                                        {
-                                                                               
validate_save();
+                                                                               
validate_submit();
                                                                        }
                                                                        catch 
(e)
                                                                        {

Modified: trunk/property/templates/base/group_select.xsl
===================================================================
--- trunk/property/templates/base/group_select.xsl      2014-06-04 13:37:28 UTC 
(rev 12005)
+++ trunk/property/templates/base/group_select.xsl      2014-06-05 08:40:52 UTC 
(rev 12006)
@@ -6,7 +6,7 @@
                <xsl:variable name="select_group_name">
                        <xsl:value-of select="select_group_name"/>
                </xsl:variable>
-               <select name="{$select_group_name}" class="forms" 
title="{$lang_group_statustext}">
+               <select name="{$select_group_name}" id="group_id" class="forms" 
title="{$lang_group_statustext}">
                        <option value="">
                                <xsl:value-of select="lang_no_group"/>
                        </option>

Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2014-06-04 13:37:28 UTC (rev 
12005)
+++ trunk/property/templates/base/tts.xsl       2014-06-05 08:40:52 UTC (rev 
12006)
@@ -148,7 +148,7 @@
                                                                                
</label>
                                                                        </td>
                                                                        <td>
-                                                                               
<select name="values[status]">
+                                                                               
<select id="status_id" name="values[status]">
                                                                                
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="php:function('lang', 'Set the status of 
the ticket')"/>
                                                                                
        </xsl:attribute>
@@ -628,7 +628,7 @@
                                                                                
                        </label>
                                                                                
                </td>
                                                                                
                <td>
-                                                                               
                        <select name="values[status]" class="forms">
+                                                                               
                        <select id="status_id" name="values[status]" 
class="forms">
                                                                                
                                <xsl:attribute name="title">
                                                                                
                                        <xsl:value-of 
select="php:function('lang', 'Set the status of the ticket')"/>
                                                                                
                                </xsl:attribute>
@@ -1055,7 +1055,7 @@
                                                                                
                        </label>
                                                                                
                </td>
                                                                                
                <td>
-                                                                               
                        <select name="values[status]" class="forms">
+                                                                               
                        <select id="status_id" name="values[status]" 
class="forms">
                                                                                
                                <xsl:attribute name="title">
                                                                                
                                        <xsl:value-of 
select="php:function('lang', 'Set the status of the ticket')"/>
                                                                                
                                </xsl:attribute>