Subversion Repositories DevTools

Rev

Rev 6191 | Rev 6197 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6191 Rev 6196
Line 54... Line 54...
54
Dim pkgSeen
54
Dim pkgSeen
55
Dim isaSdk                  ' Target is an SDK based package
55
Dim isaSdk                  ' Target is an SDK based package
56
Dim isMergable              ' Target package can be modified
56
Dim isMergable              ' Target package can be modified
57
 
57
 
58
'------------ Constants Declaration -----------
58
'------------ Constants Declaration -----------
-
 
59
Const LIMG_PENDING = "<img src='data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Merge Pending'>"
-
 
60
Const LIMG_UNCHANGED = "<img src='images/i_unchanged.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Unchnaged'>"
59
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
61
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
-
 
62
Const LIMG_OUTDATED = "<img src='images/i_outdated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Possibly Outdated'>"
60
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
63
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
61
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
64
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
62
Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Removed'>"
65
Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Removed'>"
63
Const LIMG_FILTER_ON = "<img src='images/i_data_table.gif' border='0' align='absmiddle' hspace='0' title='Filter in use.'>"
66
Const LIMG_FILTER_ON = "<img src='images/i_data_table.gif' border='0' align='absmiddle' hspace='0' title='Filter in use.'>"
64
Const LIMG_FILTER_OFF = "<img src='images/i_data_table_off.gif' border='0' align='absmiddle' hspace='0' title='Filter not in use.'>"
67
Const LIMG_FILTER_OFF = "<img src='images/i_data_table_off.gif' border='0' align='absmiddle' hspace='0' title='Filter not in use.'>"
65
Const LIMG_DROP_DOWN_ARROW = "<img src='images/i_drop_down_arrow.gif' width='5' height='15' hspace='1' border='0' align='absmiddle'>"
68
Const LIMG_DROP_DOWN_ARROW = "<img src='images/i_drop_down_arrow.gif' width='5' height='15' hspace='1' border='0' align='absmiddle'>"
66
Const LCOLOR_NOT_CHANGED = "#F5F5F5"
69
Const LCOLOR_NOT_CHANGED = "#F5F5F5"
67
Const LCOLOR_CHANGED = "#d2f7c9"
70
Const LCOLOR_CHANGED = "#d2f7c9"
-
 
71
Const LCOLOR_OUTDATED = "#ffd292"
68
Const LCOLOR_RIPPLED = "#D8F8F8"
72
Const LCOLOR_RIPPLED = "#D8F8F8"
69
Const LCOLOR_BLANK = "#FFFFFF"
73
Const LCOLOR_BLANK = "#FFFFFF"
70
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
74
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
71
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
75
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
72
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
76
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
Line 425... Line 429...
425
 
429
 
426
    Select Case nDiffState
430
    Select Case nDiffState
427
        Case "U"
431
        Case "U"
428
            outIcon  = LIMG_UPDATED
432
            outIcon  = LIMG_UPDATED
429
        Case "UW"
433
        Case "UW"
430
            outIcon  = LIMG_UPDATED
434
            outIcon  = LIMG_OUTDATED
431
        Case "A"
435
        Case "A"
432
            outIcon = LIMG_ADDED
436
            outIcon = LIMG_ADDED
433
        Case "R"
437
        Case "R"
434
            outIcon = LIMG_REMOVED
438
            outIcon = LIMG_REMOVED
435
        Case "UR"
439
        Case "UR"
436
            outIcon = LIMG_RIPPLED
440
            outIcon = LIMG_RIPPLED
-
 
441
        Case "B"
-
 
442
            outIcon = LIMG_UNCHANGED
437
        Case Else
443
        Case Else
438
            outIcon = ""
444
            outIcon = ""
439
    End Select
445
    End Select
440
 
446
 
441
End Sub
447
End Sub
Line 813... Line 819...
813
            if (elem[i].id.indexOf('SHORT_') == 0) elem[i].style.display = 'none';
819
            if (elem[i].id.indexOf('SHORT_') == 0) elem[i].style.display = 'none';
814
            if (elem[i].id.indexOf('LONG_') == 0) elem[i].style.display = 'block';
820
            if (elem[i].id.indexOf('LONG_') == 0) elem[i].style.display = 'block';
815
        }
821
        }
816
    }
822
    }
817
}
823
}
-
 
824
 
-
 
825
//  An object to contain the filter data
-
 
826
var filter;
-
 
827
 
-
 
828
// Flip the current state of each Filter check boxes
-
 
829
function initFilter() {
-
 
830
    filter = new Object();
-
 
831
    filter.btn = document.getElementById("difilterBtn");
-
 
832
    filter.x = document.getElementsByName("difilter");
-
 
833
    filter.len = filter.x.length;
-
 
834
 
-
 
835
    saveFilterState();
-
 
836
    filter.oValues = filter.Values.slice(0);
-
 
837
    setFilterTitle();
-
 
838
}
-
 
839
 
-
 
840
function toggleFilters()
-
 
841
{
-
 
842
    switch ( filter.State )
-
 
843
    {
-
 
844
    case 'Flip':
-
 
845
        for (var i = 0; i < filter.len; i++) {
-
 
846
            filter.x[i].checked = !filter.x[i].checked;
-
 
847
        }
-
 
848
        filter.State = 'On';
-
 
849
        break;
-
 
850
 
-
 
851
    case 'On':
-
 
852
        for (var i = 0; i < filter.len; i++) {
-
 
853
            filter.x[i].checked = true;
-
 
854
        }
-
 
855
        filter.State = 'Off';
-
 
856
        break;
-
 
857
 
-
 
858
    case 'Off':
-
 
859
        for (var i = 0; i < filter.len; i++) {
-
 
860
            filter.x[i].checked = false;
-
 
861
        }
-
 
862
        filter.State = 'Restore';
-
 
863
        break;
-
 
864
 
-
 
865
    case 'Restore':
-
 
866
        for (var i = 0; i < filter.len; i++) {
-
 
867
            filter.x[i].checked = filter.Values[i];
-
 
868
        }
-
 
869
        filter.State = 'Reset';
-
 
870
        break;
-
 
871
 
-
 
872
    default:
-
 
873
        for (var i = 0; i < filter.len; i++) {
-
 
874
            filter.x[i].checked = filter.oValues[i];
-
 
875
        }
-
 
876
        filter.State = 'Flip';
-
 
877
        break;
-
 
878
    }
-
 
879
 
-
 
880
    setFilterTitle();
-
 
881
    EnableRefresh();
-
 
882
}
-
 
883
 
-
 
884
// Enable the "Refresh" button - when filter is changed
-
 
885
function EnableRefresh(state)
-
 
886
{
-
 
887
    if ( filter.btn ) {
-
 
888
        // Check if shown values match the initial values
-
 
889
        var btnState = true;
-
 
890
        for (var i = 1; i < filter.len; i++) {
-
 
891
            console.log ( filter.x[i].checked,filter.oValues[i],  filter.x[i].checked != filter.oValues[i] )
-
 
892
            if ( filter.x[i].checked != filter.oValues[i] ) {
-
 
893
                btnState = false;
-
 
894
                break;
-
 
895
            }
-
 
896
        }
-
 
897
        filter.btn.disabled = btnState; 
-
 
898
    }
-
 
899
}
-
 
900
// One of the filter buttons has been clicked
-
 
901
//  First one is special (and we don't want to know about its click)
-
 
902
function filterClicked(e)
-
 
903
{
-
 
904
    if ( ! e.target.id ) {
-
 
905
        saveFilterState();
-
 
906
        setFilterTitle();
-
 
907
        EnableRefresh();
-
 
908
    }
-
 
909
}
-
 
910
 
-
 
911
function saveFilterState()
-
 
912
{
-
 
913
    filter.State = 'Flip';
-
 
914
    filter.Title = filter.x[0];
-
 
915
    filter.Values = new Array(filter.len);
-
 
916
    for (var i = 0; i < filter.len; i++) {
-
 
917
        filter.Values[i] = filter.x[i].checked;
-
 
918
    }
-
 
919
}
-
 
920
 
-
 
921
function setFilterTitle()
-
 
922
{
-
 
923
    filter.Title.checked = false;
-
 
924
    filter.Title.title = "Toggle filters: Flip, On, Off, Restore, Reset - " + filter.State;
-
 
925
}
-
 
926
 
818
//-->
927
//-->
819
</script>
928
</script>
820
<style>
929
<style>
821
#filterTable td { background-color:#E4E9EC }
930
#filterTable td { background-color:#E4E9EC }
822
}
931
}
Line 892... Line 1001...
892
                    <%End If%>
1001
                    <%End If%>
893
                                            <tr class="body_txt">
1002
                                            <tr class="body_txt">
894
                                                <td>
1003
                                                <td>
895
                                                    <%If (parRtagA <> "") AND (parRtagB <> "")Then%>
1004
                                                    <%If (parRtagA <> "") AND (parRtagB <> "")Then%>
896
                                                        <!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
1005
                                                        <!-- DIFF FILTER +++++++++++++++++++++++++++++++++++++++++++ -->
-
 
1006
                                                        <p>&nbsp;
897
                                                        <fieldset style="width:200px;">
1007
                                                        <fieldset style="width:200px;" onclick="filterClicked(event);">
898
                                                            <legend class="body_txt"><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</legend>
1008
                                                            <legend class="body_txt"><%=GetIsDiffFilterInUseIcon() %>&nbsp;Filter&nbsp;Results...</legend>
899
                                                            <table width="100%"  border="0" cellspacing="2" cellpadding="0" id=filterTable class="body_txt">
1009
                                                            <table width="100%"  border="0" cellspacing="2" cellpadding="0" id=filterTable class="body_txt">
900
                                                                <tr >
1010
                                                                <tr >
901
                                                                    <td>&nbsp;</td>
1011
                                                                    <td><input id="filterFipper" name="difilter" type="checkbox" onclick="toggleFilters();"></td>
902
                                                                <td colspan=1>Hide the marked change types.</td>
1012
                                                                    <td colspan=1>Hide the marked change types.</td>
903
                                                                </tr>
1013
                                                                </tr>
904
                                                                <tr>
1014
                                                                <tr>
905
                                                                    <td width="1"><input name="difilter" type="checkbox" value="<%=enumDB_NUM_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_UPDATED)%>></td>
1015
                                                                    <td width="1"><input name="difilter" type="checkbox" value="<%=enumDB_NUM_DIFF_UPDATED%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_UPDATED)%>></td>
906
                                                                    <td width="50" nowrap class="form_field"><%=LIMG_UPDATED%>Updated</td>
1016
                                                                    <td width="50" nowrap class="form_field"><%=LIMG_UPDATED%>Updated</td>
907
                                                                </tr>
1017
                                                                </tr>
908
                                                                <tr>
1018
                                                                <tr>
909
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_WARN%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_WARN)%>></td>
1019
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_WARN%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_WARN)%>></td>
910
                                                                    <td nowrap class="form_field"><%=LIMG_UPDATED%>Updated with Warning</td>
1020
                                                                    <td nowrap class="form_field"><%=LIMG_OUTDATED%>Updated with Warning</td>
911
                                                                </tr>
1021
                                                                </tr>
912
                                                                <tr>
1022
                                                                <tr>
913
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_NEW)%>></td>
1023
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_NEW%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_NEW)%>></td>
914
                                                                    <td nowrap class="form_field"><%=LIMG_ADDED%>Added</td>
1024
                                                                    <td nowrap class="form_field"><%=LIMG_ADDED%>Added</td>
915
                                                                </tr>
1025
                                                                </tr>
Line 921... Line 1031...
921
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_RIPPLE%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_RIPPLE)%>></td>
1031
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_RIPPLE%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_RIPPLE)%>></td>
922
                                                                    <td nowrap class="form_field"><%=LIMG_RIPPLED%>Rippled</td>
1032
                                                                    <td nowrap class="form_field"><%=LIMG_RIPPLED%>Rippled</td>
923
                                                                </tr>
1033
                                                                </tr>
924
                                                                <tr>
1034
                                                                <tr>
925
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_NO_CHANGE%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_NO_CHANGE)%>></td>
1035
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_NO_CHANGE%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_NO_CHANGE)%>></td>
926
                                                                    <td nowrap class="form_field">Unchanged</td>
1036
                                                                    <td nowrap class="form_field"><%=LIMG_UNCHANGED%>Unchanged</td>
927
                                                                </tr>
1037
                                                                </tr>
928
                                                                <tr>
1038
                                                                <tr>
929
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_PENDING%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_PENDING)%>></td>
1039
                                                                    <td><input type="checkbox" name="difilter" value="<%=enumDB_NUM_DIFF_PENDING%>" <%=GetIsDiffFilterChecked(enumDB_NUM_DIFF_PENDING)%>></td>
930
                                                                    <td nowrap class="form_field">Pending</td>
1040
                                                                    <td nowrap class="form_field"><%=LIMG_PENDING%>Pending</td>
931
                                                                </tr>
1041
                                                                </tr>
932
                                                                <tr>
1042
                                                                <tr>
933
                                                                    <td>&nbsp;</td>
1043
                                                                    <td>&nbsp;</td>
-
 
1044
                                                                    <td width="100%">
934
                                                                    <td><input name="btn" type="submit" class="form_btn" value="Refresh"></td>
1045
                                                                        <input id=difilterBtn name="btn" type="submit" class="form_btn" value="Refresh" disabled="true">
-
 
1046
                                                                    </td>
935
                                                                </tr>
1047
                                                                </tr>
936
                                                            </table>
1048
                                                            </table>
-
 
1049
                                                            <img src onerror='initFilter();'>
937
                                                        </fieldset>
1050
                                                        </fieldset>
938
                                                        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
1051
                                                        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
939
                                                    <%End If%>
1052
                                                    <%End If%>
940
                                                </td>
1053
                                                </td>
941
                                                <td></td>
1054
                                                <td></td>
Line 1075... Line 1188...
1075
                                                    errormsg = false
1188
                                                    errormsg = false
1076
                                                    rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
1189
                                                    rowId = rsQry("pv_id_a") &"_"& rsQry("pv_id_b")
1077
 
1190
 
1078
                                                    btnMerge = LIMG_MERGE
1191
                                                    btnMerge = LIMG_MERGE
1079
                                                    btnRemove = LIMG_REMOVE
1192
                                                    btnRemove = LIMG_REMOVE
1080
                                                    colorA = LCOLOR_NOT_CHANGED
-
 
1081
                                                    colorB = LCOLOR_NOT_CHANGED
-
 
1082
 
1193
 
1083
                                                    changeType = rsQry("change_type")
1194
                                                    changeType = rsQry("change_type")
1084
                                                    isaSdk = rsQry("PKG_SDK_B")
1195
                                                    isaSdk = rsQry("PKG_SDK_B")
1085
 
1196
 
1086
                                                    Select Case changeType
-
 
1087
                                                        Case "U"
-
 
1088
                                                            colorA = LCOLOR_CHANGED
-
 
1089
                                                            colorB = LCOLOR_CHANGED
-
 
1090
                                                        Case "UW"
-
 
1091
                                                            colorA = LCOLOR_CHANGED
-
 
1092
                                                            colorB = LCOLOR_CHANGED
-
 
1093
                                                            btnMerge = LIMG_MERGE_WARN
-
 
1094
                                                        Case "UR"
-
 
1095
                                                            colorA = LCOLOR_RIPPLED
-
 
1096
                                                            colorB = LCOLOR_RIPPLED
-
 
1097
                                                        Case "A"
-
 
1098
                                                            colorA = LCOLOR_BLANK
-
 
1099
                                                        Case "R"
-
 
1100
                                                            colorB = LCOLOR_BLANK
-
 
1101
                                                    End Select
-
 
1102
 
-
 
1103
                                                    Call GetDiffStateIcon ( changeType, ChangeTypeIcon )
-
 
1104
 
-
 
1105
                                                    If changeType = "U" OR changeType = "UW" OR changeType = "UR" Then
1197
                                                    If changeType = "U" OR changeType = "UW" OR changeType = "UR" Then
1106
                                                        Dim MajorA, MajorB, MinorA, MinorB, PatchA, PatchB, BuildA, BuildB, pos, pkgVersionA, pkgVersionB, majMinA, majMinB
1198
                                                        Dim MajorA, MajorB, MinorA, MinorB, PatchA, PatchB, BuildA, BuildB, pos, pkgVersionA, pkgVersionB, majMinA, majMinB
1107
                                                        MajorA = NULL
1199
                                                        MajorA = NULL
1108
                                                        MajorB = NULL
1200
                                                        MajorB = NULL
1109
                                                        MinorA = NULL
1201
                                                        MinorA = NULL
Line 1220... Line 1312...
1220
                                                            skipRow = TRUE
1312
                                                            skipRow = TRUE
1221
                                                        End If
1313
                                                        End If
1222
                                                    End If
1314
                                                    End If
1223
 
1315
 
1224
                                                    If NOT skipRow Then
1316
                                                    If NOT skipRow Then
-
 
1317
                                                        Call GetDiffStateIcon ( changeType, ChangeTypeIcon )
-
 
1318
 
-
 
1319
                                                    colorA = LCOLOR_NOT_CHANGED
-
 
1320
                                                    colorB = LCOLOR_NOT_CHANGED
-
 
1321
                                                    Select Case changeType
-
 
1322
                                                        Case "U"
-
 
1323
                                                            colorA = LCOLOR_CHANGED
-
 
1324
                                                            colorB = LCOLOR_CHANGED
-
 
1325
                                                        Case "UW"
-
 
1326
                                                            colorA = LCOLOR_OUTDATED
-
 
1327
                                                            colorB = LCOLOR_OUTDATED
-
 
1328
                                                            btnMerge = LIMG_MERGE_WARN
-
 
1329
                                                        Case "UR"
-
 
1330
                                                            colorA = LCOLOR_RIPPLED
-
 
1331
                                                            colorB = LCOLOR_RIPPLED
-
 
1332
                                                        Case "A"
-
 
1333
                                                            colorA = LCOLOR_BLANK
-
 
1334
                                                        Case "R"
-
 
1335
                                                            colorB = LCOLOR_BLANK
-
 
1336
                                                    End Select
-
 
1337
 
-
 
1338
 
1225
                                                    ' -------- GROUP BY BASE VIEW  -----------------
1339
                                                    ' -------- GROUP BY BASE VIEW  -----------------
1226
                                                    If CDbl(currView_id) <> CDbl(rsQry("view_id")) Then
1340
                                                    If CDbl(currView_id) <> CDbl(rsQry("view_id")) Then
1227
                                                    %>
1341
                                                    %>
1228
                                                        <tr>
1342
                                                        <tr>
1229
                                                            <td valign="top" nowrap class="form_ttl"><b><%=rsQry("view_name")%></b></td>
1343
                                                            <td valign="top" nowrap class="form_ttl"><b><%=rsQry("view_name")%></b></td>