version 4.0.0

SiegeEngineers · Mar 16, 2020 · 3b954c5 · 3b954c5
1 parent 4469d2b
commit 3b954c5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/js/src/Main.js b/js/src/Main.js
@@ -34,7 +34,7 @@ const Main = () => {
             <Grid item><Stat title='Maps' stat={data.stats.map_count.toLocaleString()} /></Grid>
           </Grid>
           <Grid container>
-            <Grid item xs={12}>
+            <Grid item xs={4}>
               <Card>
                 <CardContent>
                   <Typography variant='h5'>Match Additions</Typography>

diff --git a/js/src/Reports.js b/js/src/Reports.js
@@ -17,7 +17,6 @@ import Typography from '@material-ui/core/Typography'
 
 import ReactCountryFlag from 'react-country-flag'
 import {format, subMonths} from 'date-fns'
-import humanizeDuration from 'humanize-duration'
 
 import AppLink from './util/AppLink'
 import DataQuery from './util/DataQuery'
@@ -72,7 +71,7 @@ const LongestMatchesSection = ({data}) => {
                 <TableCell>{index + 1}</TableCell>
                 <TableCell><AppLink path={['match', match.id]} text={getMatchTitle(match, false)} /></TableCell>
                 <TableCell> <AppLink path={['maps', match.map_name]} text={match.map_name} /></TableCell>
-                <TableCell>{humanizeDuration(match.duration_secs * 1000)}</TableCell>
+                <TableCell>{match.duration}</TableCell>
               </TableRow>
             )}
           </TableBody>

diff --git a/js/src/Search.js b/js/src/Search.js
@@ -34,7 +34,7 @@ const GeneralSection = ({data}) => {
           <OptionInput label='Mirror' table='matches' name='mirror' data={data.search_options.general.mirror} />
           <OptionInput label='Rated' table='matches' name='rated' data={data.search_options.general.rated} />
           <OptionInput label='ZR' table='matches' name='rms_zr' data={data.search_options.general.rms_zr} />
-          <OptionInput label='Playback' table='matches' name='has_playback' data={data.search_options.general.playback} />
+          <OptionInput label='Extended Stats' table='matches' name='has_playback' data={data.search_options.general.playback} />
           <OptionInput label='Event' table='matches' name='event_id' data={data.search_options.general.events} />
           <OptionInput label='Tournament' table='matches' name='tournament_id' data={data.search_options.general.tournaments} />
           <DateInput label='Played' table='matches' name='played' />

diff --git a/js/src/graphql/Report.js b/js/src/graphql/Report.js
@@ -94,7 +94,7 @@ query Report($year: Int!, $month: Int!) {
       diplomacy_type
       team_size
       map_name
-      duration_secs
+      duration
     }
   }
 }

diff --git a/js/src/match/Map.js b/js/src/match/Map.js
@@ -25,7 +25,7 @@ const Map = ({match}) => {
           <TableRow>
             <TableCell>Size</TableCell>
             {match.map_events && <TableCell>Events</TableCell>}
-            <TableCell>Seed</TableCell>
+            {match.rms_seed && <TableCell>Seed</TableCell>}
             <TableCell align='center'>Custom</TableCell>
             <TableCell align='center'>Fixed Positions</TableCell>
             <TableCell align='center'>Tech Effects</TableCell>
@@ -39,7 +39,7 @@ const Map = ({match}) => {
             <AppLink key={event.id} path={['events', event.id]} text={event.name} />
           ])}
             </TableCell>}
-            <TableCell><code>{match.rms_seed}</code></TableCell>
+            {match.rms_seed && <TableCell><code>{match.rms_seed}</code></TableCell>}
             <TableCell align='center'><BoolIcon value={match.rms_custom} /></TableCell>
             <TableCell align='center'><BoolIcon value={match.direct_placement} /></TableCell>
             <TableCell align='center'><BoolIcon value={match.effect_quantity} /></TableCell>

diff --git a/python/aocrecs/logic/search.py b/python/aocrecs/logic/search.py
@@ -51,7 +51,7 @@ def build_query(params, offset, limit):
 
     query = append_flags(query, params, args)
 
-    query_template = "select distinct matches.id {} order by matches.id desc limit {} offset {}"
+    query_template = "select distinct matches.id, matches.played {} order by matches.played desc nulls last limit {} offset {}"
     return query_template.format(query, limit, offset), 'select count(distinct matches.id) {}'.format(query), args
 
 

diff --git a/python/setup.py b/python/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='aocrecs',
-    version='3.0.2',
+    version='4.0.0',
     description='aocrecs.com API.',
     url='https://github.com/siegeengineers/aocrecs.com/',
     license='MIT',
@@ -18,7 +18,7 @@
         'boto3==1.10.46',
         'coloredlogs==10.0',
         'databases==0.2.6',
-        'mgzdb>=1.2.9',
+        'mgzdb>=1.3.0',
         'networkx==2.4',
         'python-dateutil==2.8.1',
         'python-multipart==0.0.5',