Changes

Added Results & Notes row merging functionality (Basically exclusively for Type 0 Observation Seaplane).
Line 20: Line 20:  
{{!}} align="center" rowspan="{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}|{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Bauxite}}}
 
{{!}} align="center" rowspan="{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}|{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Bauxite}}}
 
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}|{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Secretary}}}
 
! align="center" style="background-color:#EEFFCC;" rowspan="{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}|{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Secretary}}}
{{!}} {{{R1Results}}}
+
{{!}} rowspan="{{#ifeq:{{{R1Results|}}}|{{{R2Results|}}}|{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Results}}}
{{!}} {{{R1Notes|}}}
+
{{!}} rowspan="{{#ifeq:{{{R1Notes|}}}|{{{R2Notes|}}}|{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}}|3}}|2}}|1}}" {{!}} {{{R1Notes|}}}
 
{{!}}-
 
{{!}}-
 
{{#if:{{{R2Fuel|}}}{{{R2Ammo|}}}{{{R2Steel|}}}{{{R2Bauxite|}}}|  
 
{{#if:{{{R2Fuel|}}}{{{R2Ammo|}}}{{{R2Steel|}}}{{{R2Bauxite|}}}|  
Line 29: Line 29:  
{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -1+{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Bauxite}}} }}
 
{{#ifeq:{{{R1Bauxite|}}}|{{{R2Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -1+{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}|{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Bauxite}}} }}
 
{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -1+{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Secretary}}} }}
 
{{#ifeq:{{{R1Secretary|}}}|{{{R2Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -1+{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}|{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Secretary}}} }}
{{!}} {{{R2Results}}}
+
{{#ifeq:{{{R1Results|}}}|{{{R2Results|}}}||{{!}} rowspan="{{#expr: -1+{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}|{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Results}}} }}
{{!}} {{{R2Notes|}}}
+
{{#ifeq:{{{R1Notes|}}}|{{{R2Notes|}}}||{{!}} rowspan="{{#expr: -1+{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}|{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}}|3}}|2}} }}" {{!}} {{{R2Notes|}}} }}
 
{{!}}-
 
{{!}}-
 
{{#if:{{{R3Fuel|}}}{{{R3Ammo|}}}{{{R3Steel|}}}{{{R3Bauxite|}}}|  
 
{{#if:{{{R3Fuel|}}}{{{R3Ammo|}}}{{{R3Steel|}}}{{{R3Bauxite|}}}|  
Line 38: Line 38:  
{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -2+{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}} }}" {{!}} {{{R3Bauxite}}} }}
 
{{#ifeq:{{{R2Bauxite|}}}|{{{R3Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -2+{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}|{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}}|3}} }}" {{!}} {{{R3Bauxite}}} }}
 
{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -2+{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}} }}" {{!}} {{{R3Secretary}}} }}
 
{{#ifeq:{{{R2Secretary|}}}|{{{R3Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -2+{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}|{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}}|3}} }}" {{!}} {{{R3Secretary}}} }}
{{!}} {{{R3Results}}}
+
{{#ifeq:{{{R2Results|}}}|{{{R3Results|}}}||{{!}} rowspan="{{#expr: -2+{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}|{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}}|3}} }}" {{!}} {{{R3Results}}} }}
{{!}} {{{R3Notes|}}}
+
{{#ifeq:{{{R2Notes|}}}|{{{R3Notes|}}}||{{!}} rowspan="{{#expr: -2+{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}|{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}}|3}} }}" {{!}} {{{R3Notes|}}} }}
 
{{!}}-
 
{{!}}-
 
{{#if:{{{R4Fuel|}}}{{{R4Ammo|}}}{{{R4Steel|}}}{{{R4Bauxite|}}}|  
 
{{#if:{{{R4Fuel|}}}{{{R4Ammo|}}}{{{R4Steel|}}}{{{R4Bauxite|}}}|  
Line 47: Line 47:  
{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -3+{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}} }}" {{!}} {{{R4Bauxite}}} }}
 
{{#ifeq:{{{R3Bauxite|}}}|{{{R4Bauxite|}}}||{{!}} align="center" rowspan="{{#expr: -3+{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}|5|4}} }}" {{!}} {{{R4Bauxite}}} }}
 
{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -3+{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}} }}" {{!}} {{{R4Secretary}}} }}
 
{{#ifeq:{{{R3Secretary|}}}|{{{R4Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="{{#expr: -3+{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}|5|4}} }}" {{!}} {{{R4Secretary}}} }}
{{!}} {{{R4Results}}}
+
{{#ifeq:{{{R3Results|}}}|{{{R4Results|}}}||{{!}} rowspan="{{#expr: -3+{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}|5|4}} }}" {{!}} {{{R4Results}}} }}
{{!}} {{{R4Notes|}}}
+
{{#ifeq:{{{R3Notes|}}}|{{{R4Notes|}}}||{{!}} rowspan="{{#expr: -3+{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}|5|4}} }}" {{!}} {{{R4Notes|}}} }}
 
{{!}}-
 
{{!}}-
 
{{#if:{{{R5Fuel|}}}{{{R5Ammo|}}}{{{R5Steel|}}}{{{R5Bauxite|}}}|  
 
{{#if:{{{R5Fuel|}}}{{{R5Ammo|}}}{{{R5Steel|}}}{{{R5Bauxite|}}}|  
{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}||{{!}} align="center" rowspan="1" {{!}} {{{R5Fuel}}} }}
+
{{#ifeq:{{{R4Fuel|}}}|{{{R5Fuel|}}}||{{!}} align="center" {{!}} {{{R5Fuel}}} }}
{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}||{{!}} align="center" rowspan="1" {{!}} {{{R5Ammo}}} }}
+
{{#ifeq:{{{R4Ammo|}}}|{{{R5Ammo|}}}||{{!}} align="center" {{!}} {{{R5Ammo}}} }}
{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}||{{!}} align="center" rowspan="1" {{!}} {{{R5Steel}}} }}
+
{{#ifeq:{{{R4Steel|}}}|{{{R5Steel|}}}||{{!}} align="center" {{!}} {{{R5Steel}}} }}
{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}||{{!}} align="center" rowspan="1" {{!}} {{{R5Bauxite}}} }}
+
{{#ifeq:{{{R4Bauxite|}}}|{{{R5Bauxite|}}}||{{!}} align="center" {{!}} {{{R5Bauxite}}} }}
{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" rowspan="1" {{!}} {{{R5Secretary}}} }}
+
{{#ifeq:{{{R4Secretary|}}}|{{{R5Secretary|}}}||{{!}} ! align="center" style="background-color:#EEFFCC;" {{!}} {{{R5Secretary}}} }}
{{!}} {{{R5Results}}}
+
{{#ifeq:{{{R4Results|}}}|{{{R5Results|}}}||{{!}} {{{R5Results}}} }}
{{!}} {{{R5Notes|}}}
+
{{#ifeq:{{{R4Notes|}}}|{{{R5Notes|}}}||{{!}} {{{R5Notes|}}} }}
 
{{!}}-
 
{{!}}-
 
}} }} }} }}</includeonly><noinclude>
 
}} }} }} }}</includeonly><noinclude>
advmod, cssedit, Interface administrators, janitor, Moderators, prechecked, Widget editors
7,373

edits