Maxim Sokhatsky 11 years ago
parent
commit
e85c61e27c
3 changed files with 73 additions and 84 deletions
  1. 36 36
      apps/db/include/table.hrl
  2. 36 48
      apps/db/include/tournaments.hrl
  3. 1 0
      apps/face/priv/static/doc/svg.htm

+ 36 - 36
apps/db/include/table.hrl

@@ -4,41 +4,41 @@
 -include_lib("kvs/include/kvs.hrl").
 
 -record(game_table, {?ITERATOR(feed),
-          name,
-          gameid,
-          trn_id,
-          game_type,
-          rounds,
-          sets,
-          owner,
-          timestamp,
-          users = [],
-          users_options = [],
-          game_mode,
-          game_options,
-          game_speed,
-          friends_only,
-          invited_users = [],
-          private :: boolean(),
-          feel_lucky = false :: boolean(),
-          creator,
-          age_limit,
-          groups_only = [],
-          gender_limit,
-          location_limit = "",
-          paid_only,
-          deny_robots = false :: boolean(),
-          slang,
-          deny_observers,
-          gosterge_finish = false :: boolean(),
-          double_points = 1 :: integer(),
-          game_state,
-          game_process :: pid(),
-          game_module :: atom(),
-          pointing_rules :: any(),
-          pointing_rules_ex :: [], %% [#pointing_rule{}] - list of additional pointing rules,
-          game_process_monitor :: reference(),
-          tournament_type = simple :: simple | paired | paired_lobby | tournament,
-          robots_replacement_allowed = true :: boolean()}).
+    name,
+    gameid,
+    trn_id,
+    game_type,
+    rounds,
+    sets,
+    owner,
+    timestamp,
+    users = [],
+    users_options = [],
+    game_mode,
+    game_options,
+    game_speed,
+    friends_only,
+    invited_users = [],
+    private :: boolean(),
+    feel_lucky = false :: boolean(),
+    creator,
+    age_limit,
+    groups_only = [],
+    gender_limit,
+    location_limit = "",
+    paid_only,
+    deny_robots = false :: boolean(),
+    slang,
+    deny_observers,
+    gosterge_finish = false :: boolean(),
+    double_points = 1 :: integer(),
+    game_state,
+    game_process :: pid(),
+    game_module :: atom(),
+    pointing_rules :: any(),
+    pointing_rules_ex :: [], %% [#pointing_rule{}] - list of additional pointing rules,
+    game_process_monitor :: reference(),
+    tournament_type = simple :: simple | paired | paired_lobby | tournament,
+    robots_replacement_allowed = true :: boolean()}).
 
 -endif.

+ 36 - 48
apps/db/include/tournaments.hrl

@@ -3,55 +3,43 @@
 
 -include_lib("kvs/include/kvs.hrl").
 
--record(team,
-        {
-          ?ITERATOR(feed),
-          name, %% team name for now will bu just first player username
-          play_record, %% linked list history of played users under that ticket
-          type
-        }
-       ).
+-record(team,{?ITERATOR(feed),
+    name, %% team name for now will bu just first player username
+    play_record, %% linked list history of played users under that ticket
+    type}).
 
--record(tournament,
-        {
-          ?ITERATOR(feed),
-          name, %% tournament name
-          game_type,
-          description,
-          creator,
-          created,
-          start_date,
-          start_time,
-          end_date,
-          status, %% activated, ongoing, finished, canceled
-          quota,
-          tours,
-          awards, 
-          winners :: list(), %% [{UserId, Position, GiftId}]
-          waiting_queue, %% play_record, added here when user wants to join tournament
-          avatar,
-          owner,
-          players_count,
-          speed,
-          type,
-          game_mode
-        }
-       ). %% eliminatin, pointing, etc
+-record(tournament,{?ITERATOR(feed),
+    name, %% tournament name
+    game_type,
+    description,
+    creator,
+    created,
+    start_date,
+    start_time,
+    end_date,
+    status, %% activated, ongoing, finished, canceled
+    quota,
+    tours,
+    awards, 
+    winners :: list(), %% [{UserId, Position, GiftId}]
+    waiting_queue, %% play_record, added here when user wants to join tournament
+    avatar,
+    owner,
+    players_count,
+    speed,
+    type,
+    game_mode}). %% eliminatin, pointing, etc
 
--record(play_record, %% tournament_player, game_record, tournament_info, choose your name :)
-        {
-          ?ITERATOR(feed),
-          who, %% user
-          tournament, %% tournament in which user played
-          team, %% team under which user player tournament
-          game_id, %% game id that user played under that team
-          realname,
-          game_points,
-          kakush,
-          kakush_currency,
-          quota,
-          other
-        }
-       ).
+-record(play_record,{?ITERATOR(feed),
+    who, %% user
+    tournament, %% tournament in which user played
+    team, %% team under which user player tournament
+    game_id, %% game id that user played under that team
+    realname,
+    game_points,
+    kakush,
+    kakush_currency,
+    quota,
+    other}).
 
 -endif.

+ 1 - 0
apps/face/priv/static/doc/svg.htm

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <html>
 <head>
+    <meta charset="utf-8"/>
 <link href="synrc.css" type="text/css" rel="stylesheet">
 <link href='http://fonts.googleapis.com/css?family=Exo+2:600' rel='stylesheet' type='text/css'>
 </head>