WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/form_rep_new_versions.asp

 <!--#include file="common/common_subs.asp"-->
 <!--#include file="common/_form_window_common.asp"-->
 <!--#include file="_action_buttons.asp"-->
 <!--#include file="class/classActionButtonControl.asp"-->
 <% '------------ ACCESS CONTROL ------------------ %>
-<!--#include file="_access_control_login.asp"-->
+<!--#include file="_access_control_login_optional.asp"-->
 <!--#include file="_access_control_general.asp"-->
 <!--#include file="_access_control_action_project.asp"-->
 <%
 '------------ Variable Definition -------------
 Dim parRtagId
+Dim canModify
+Dim disabledTxt : disabledTxt = ""
+Dim disabledImage : disabledImage = ""
 '------------ Constants Declaration -----------
 '------------ Variable Init -------------------
 parRtagId = Request("rtag_id")
 objPMod.PersistInQryString("rtag_id")
-'----------------------------------------------
-%>
-<%
-%>
-<%
-'------------ RUN BEFORE PAGE RENDER ----------
-'----------------------------------------------------
-' --- RUN onPostBack ---
-If Request("action") <> "" AND objAccessControl.UserLogedIn Then
-      If objEH.Finally Then
-         Call OpenInWindow ( "release_config.asp?rtag_id="& parRtagId )
+canModify = releaseIsMergable(releaseInfoHash("official"))
-      End If
+If NOT canModify Then
+    disabledTxt = " - Disabled"
+    disabledImage = ",url('images/abtn__small_remove.gif')  no-repeat center center"
 End If
+'------------ RUN BEFORE PAGE RENDER ----------
 '----------------------------------------------
-Sub InsertLocalStyle %>
+Sub InsertLocalStyle%>
     <style type="text/css">
-        td.useThis:not(.useRemove) {background: url('images/i_added.gif') no-repeat center center; cursor: pointer; }
+        td.useThis:not(.useRemove) {background: url('images/i_added.gif') no-repeat center center<%=disabledImage%>; cursor: pointer; }
-        td.useThis.useRemove {background: url('images/i_removed.gif') no-repeat center center; cursor: pointer; }
+        td.useThis.useRemove {background: url('images/i_removed.gif') no-repeat center center<%=disabledImage%>; cursor: pointer; }
         .tooOld:not(.forceShow),.hiddenChild:not(.forceShow) {display:none;}
+        table.dataTable tbody tr.child{background-color: #e0e0e0;}
     </style>
 <%End Sub
 '----------------------------------------------
 Sub InsertJavaScript %>
       <script language="JavaScript" type="text/JavaScript">
+        formTips.tips.h_nvReport    = stdTip(400, 'Newer Version Report', 'This page will display newer (non-ripple) versions of packages in the current release.' +
+                                                                    '<p>The intent of this page is to allow a developer to see if work has been performed on ' +
+                                                                    'packages in this release and consider including the new version into the release.' +
+                                                                    '<p>Its possible to merge a newer version into the current Release, and to undo the operation.' +
+                                                                    '<p>A filter allows only recent versions to be considered.'
+                                                                    );
+        formTips.tips.h_merge       = stdTip(300, 'Merge Version', 'The selected version can be merged into the Release.' +
+                                                                    '<p>The version will added as a Pending Merge.' +
+                                                                    '<p>Once all required versions have been selected they will need to be released into the Release.'
+                                                                    );
       $(document).ready(function() {
         var nvAgeLimit = 31;
         // Generate Row Data from JavaScript data
         function getPkgName ( row, type, set, meta ) {
           var hRef = "view_by_version.asp?pkg_id=" + row[2] + "&hideRipple=True" + "&fpkgversion=*" + row[5]
           return img + "<a href=" + hRef + ">" + row[3] + "</a>"
+        }
         function getVersion ( row, type, set, meta ) {
-          var hRef = "dependencies.asp?pv_id=" + row[0] + "&rtag_id=" + <%=parRtagId%>
+          var hRef = "fixed_issues.asp?pv_id=" + row[0] + "&rtag_id=" + <%=parRtagId%>
           return "<a href=" + hRef + ">" + row[4] + "</a>"
+        }
         function getNewerVersion ( row, type, set, meta ) {
-          var hRef = "dependencies.asp?pv_id=" + row[7]
-          return "<a href=" + hRef + ">" + row[8] + "</a>"
-        }
-        // Format row of data for extended version display
-        // Return as a tr node so that the colums can be added to the current table
+          var img = "<img src='images/history.png' width=11 height=11 border='0' align='absmiddle' hspace='3' class='pointer showHistory fright' title='Show History'>"
-        // and have them line up with existing columns
-        function format(d){
-             var rv = [];
-             var dd = d[10];
-             for (var ii in dd) {
-                 row = $('<tr/>').attr('data-npvid', dd[ii][0]).attr('data-pvid', d[0]);
-                 row.append($('<td/>').append( '' ).attr('colspan', '4'));
-                 row.append($('<td/>').append( $('<a/>').append( dd[ii][1]).attr('href', 'dependencies.asp?pv_id=' + dd[ii][0]) ));
+          var img2 = "<img src='images/i_used_by.gif' width=11 height=11 border='0' align='absmiddle' hspace='3' class='pointer showProjects fright' title='Show Projects using this version'>"
-                 row.append($('<td/>').append( dd[ii][2] ));
+          var hRef = "fixed_issues.asp?pv_id=" + row[7]
-                 row.append($('<td/>').addClass('useThis'));
+          return "<a href=" + hRef + ">" + row[8] + "</a>" + img2 + img
-                 rv.push(row);
-             }
-             return rv;
+        }
         var nvTable;
         function loadTable() {
             /* Init DataTables */
             nvTable = $('#nvtable').DataTable({
-                //bLengthChange : false,
                 sDom : "rti",
                 data : dataSet,
                 columns : [
                 { data : getPkgName },
                 { data : getVersion  , orderable : false},
                 { data : [1] },
                 { data : [6] },
-                { data : getNewerVersion  , orderable : false},
+                { data : getNewerVersion  , orderable : false, className : 'tight'},
                 { data : [9], orderData :[0,5] },
                 { data : null, defaultContent: "", className : 'useThis' , orderable : false},
                 ],
                 createdRow : function( row, data, dataIndex, cells ) {
                     $(row).attr('data-npvid', data[7]).attr('data-pvid', data[0]);
                     if ( nvAgeLimit > 0 ) {
                         if ( parseInt(data[11]) > nvAgeLimit ) {
                             $(row).addClass('tooOld');
+                        }
+                    }
                 },
                 infoCallback: function( settings, start, end, max, total, pre ) {
                      return getUpdateInfo();
                 },
                 scrollCollapse : true,
                     {className : "dt-nowrap", targets: "_all" },
                 ],
             });
+        }
-        // Load Data once via AJAX
+        //  Load Data once via AJAX
+        //  When loaded
+        //      display the datatable
+        //      Update 'title' (hover text) on controls
         var dataSet;
         $.get({
             url: 'rep_new_versions_json.asp',
             dataType : 'json',
             data : {
                    action : 'getData'
                    },
             success : function(data, textStatus, jqXHR){
                 dataSet = data.aaData;
                 loadTable();
+                $('td.useThis').prop('title', 'Merge this version into the Release<%=disabledTxt%>');
+                $('td.useRemove').prop('title', 'Remove this version from pending merge<%=disabledTxt%>');
+            }
         }).done( function(){
             $('#loading').remove();
         }).fail( function(jqXHR, textStatus, errorThrown){
                 tr.addClass('shown');
                 $(this).attr('src', 'images/bt_minus.gif');
             };
             updateInfo();
         });
+<%If canModify Then %>
         // Add event listner to all a verion to be 'used'
         $('#nvtable tbody').on('click', '.useThis', function () {
             var tgtEl = $(this)
             var tr = $(this).closest('tr');
             var pvid = tr.data('pvid');
                        mode : isaRemove ? 'R' : 'A'
                        },
                 success : function(data, textStatus, jqXHR){
                             if (data.result != 0){
                                 setInfo("Error: " + (data.hasOwnProperty('emsgSummary') ? data.emsgSummary : "Reason not given"));
+                                return;
+                            }
+                            tgtEl.toggleClass('useRemove');
+                            tr.toggleClass('forceShow');
-                }
+                    }
             }).done( function(){
-                tgtEl.toggleClass('useRemove');
-                tr.toggleClass('forceShow');
             }).always( function(){
                 $("body").removeClass("cursor-wait");
             }).fail( function(jqXHR, textStatus, errorThrown){
                         setInfo("Error: " + errorThrown );
             });
         });
+<%End If%>
        //  Toggle All the extended versions
         //  Show/Hide the ALL children, unless they have been 'merged'
         $('#toggleAll').click(function(event){
                 };
             });
             updateInfo();
         });
+        //  Show History button
+        $('#nvtable tbody').on('click', '.showHistory', function (event) {
+            var tr = $(this).closest('tr');
+            var pvid = tr.data('pvid');
+            var npvid = tr.data('npvid');
+            var data = nvTable.row( tr ).data();
+            var url = '_wform_versions_history_release_notes.asp?&rtag_id=<%=parRtagId%>&hideRipple=True&pv_id='+npvid+'&pkg_id='+data[2]+'&FLpkg_version=*'+data[5];
+            var features = 'left=50,top=50,resizable=yes,scrollbars=yes,width=1000,height='+ ( screen.height - 100 );
+            window.open(url,'History', features);
+        });
+        // Show Project Version dialog
+        $('#nvtable tbody').on('click', '.showProjects', function (event) {
+            var tr = $(this).closest('tr');
+            var pvid = tr.data('pvid');
+            var npvid = tr.data('npvid');
+            var data = nvTable.row( tr ).data();
+            $('#popmenu').load('rep_new_versions_info.asp', {pvid: npvid});
+        });
         //  Ajax Error message support
         function setInfo(txt) {
             $("#nvError").text(txt).addClass("errorPanel").show();
+        }
         // Update the (simulated ) table info
         function getUpdateInfo() {
             var children = $('#nvtable tbody tr');
             var total = children.length;
             var hidden = children.filter('.tooOld:not(.forceShow),.hiddenChild:not(.forceShow)').length;
             return "Showing "+ (total - hidden) +" of " + total + ". (" + hidden + " not shown)";
+        }
 Sub LeftPanelContent
 %>
 <fieldset class="body_rowg fset">
     <legend>Filter</legend>
         <span id=nvArg>
-            <input     type="radio" name="age" value="7"> Last Week
+            <input     type="radio" name="age" value="1"> Last Day
+            <br><input type="radio" name="age" value="7"> Last Week
             <br><input type="radio" name="age" value="14"> Last 2 Weeks
             <br><input type="radio" name="age" value="21"> Last 3 Weeks
             <br><input type="radio" name="age" value="31" checked="checked"> Last Month
             <br><input type="radio" name="age" value="62"> Last 2 Months
             <br><input type="radio" name="age" value="365"> Last Year
 End Sub
 Sub MainPanelContent
 %>
    <div class=Panel>
-    <div class=rounded_box_caption>New Version Report</div>
+    <div class=rounded_box_caption>Newer Version Report<%=Quick_Help("h_nvReport")%></div>
     <div class="rounded_box">
        <div class=PanelFrame>
             <!-- MESSAGE +++++++++++++++++++++++++++++++++++++++++++++++++++ -->
             <!--#include file="messages/_msg_inline.asp"-->
             <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
             <div class=textPanel>
                 <table id='nvtable' width="100%" class="stdGrey">
                    <thead>
-                      <th nowrap><img id='toggleAll' src='images/bt_plus.gif' border='0' align='absmiddle' hspace='3' class='pointer'>Package Name</th>
+                      <th nowrap><img id='toggleAll' src='images/bt_plus.gif' border='0' align='absmiddle' hspace='3' class='pointer' title='Expand/Hide other versions'>Package Name</th>
                       <th nowrap>Version</th>
                       <th nowrap>Base View</th>
                       <th nowrap>Created</th>
                       <th nowrap>Newer Version</th>
                       <th nowrap>Created</th>
-                      <th nowrap></th>
+                      <th nowrap><%=Quick_Help("h_merge")%></th>
                    </thead>
                     <tr id='loading' >
                         <td colspan=7 class=tcenter>
                             <img src='images/transparent-background-loading.gif'>
                         </td>
       <meta http-equiv="Pragma" content="no-cache">
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
       <link rel="stylesheet" href="images/release_manager_style.css?ver=<%=VixVerNum%>" type="text/css">
       <link rel="stylesheet" href="images/navigation.css?ver=<%=VixVerNum%>" type="text/css">
       <script language="JavaScript" src="images/common.js?ver=<%=VixVerNum%>"></script>
+      <!-- TIPS -->
+      <script language="JavaScript" src="images/tipster.js?ver=<%=VixVerNum%>"></script>
+      <script language="JavaScript" src="images/_help_tips.js?ver=<%=VixVerNum%>"></script>
       <!-- DROPDOWN MENUS -->
+      <%bJqueryVix=TRUE%>
       <%bJqueryDataTables = TRUE%>
       <%sJqueryDataTablesCss="jquery/dataTables.vix.grey.css"%>
       <!--#include file="_jquery_includes.asp"-->
       <!--#include file="_menu_def.asp"-->
       <script language="JavaScript1.2" src="images/popup_menu.js?ver=<%=VixVerNum%>"></script>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/form_rep_new_versions.asp – Rev 6970 → 6971