hype features

src/api/GlobalApi.js

@@ -72,6 +72,7 @@ export default class GlobalApi {
     }
 
     getHumanServerName(server) {
+        this.create_server_websocket();
         for (const srv in this.stats.servers_map) {
             if (this.stats.servers_map[srv]['key'] === server) return this.stats.servers_map[srv]['name'];
         }

src/components/ActionDialogs/Tables/KillAssistDeadDialog.vue

@@ -33,6 +33,7 @@
             </md-field>
           </div>
           <md-button style="float: left;" class="btn-hand" v-on:click="update(1, rowsPerPage)">Искать</md-button>
+          <md-switch v-model="currentSes" v-on:change="update(1, rowsPerPage)">Текущая сессия</md-switch>
           <md-button style="float:left;" class="btn-unusual" v-if="type===0" v-on:click="$refs.mkd_lw.showMe(true, steam64, srv)">Любимые оружия</md-button>
           <md-button style="float: right;" class="btn-colored" v-on:click="showMe(false)">Закрыть</md-button>
         </div>
@@ -67,6 +68,7 @@ export default {
     srv: null,
     srv_setted: false,
     type: 0,
+    currentSes:false,
     mykills: {
       mdCount: 1,
       mdPage: 1,
@@ -95,7 +97,7 @@ export default {
         case 1: {method = "delete"; break;}
         case 2: {method = "put"; break;}
       }
-      axios[method](`api/profile/killfeed?${this.steam64 === null?'':`steam64=${this.steam64}&`}${this.srv===null?'':`srv=${this.srv}&`}limit=${Math.abs(limit)}&offset=${offset}` + Random.getRndWebAppend()).then(
+      axios[method](`api/profile/killfeed?${this.steam64 === null?'':`steam64=${this.steam64}&`}${this.srv===null?'':`srv=${this.srv}&`}limit=${Math.abs(limit)}&offset=${offset}&current=${this.currentSes}` + Random.getRndWebAppend()).then(
           (response) => {
             if (response.status === 200) {
               this.mykills.mdData = response.data['result'];

src/components/TabsMenuElements/ProfileView/Components/ProfileContainer.vue

@@ -88,10 +88,10 @@
         <p class="profile-text" style="text-align: right; cursor: pointer;" v-if="this.player['play_on'] !== null && 'ip' in this.player['play_on']" v-on:click="showIP()">IP : {{player_ip}}</p>
         <p class="profile-text" style="text-align: right; cursor: pointer;" v-if="this.player['play_on'] !== null && 'country' in this.player['play_on']">Страна : {{this.player['play_on']['country']}}</p>
         <p class="profile-text clickable" style="text-align: right" v-on:click="loadKillFeed()">К\Д : {{this.killfeed.loading?'Загрузка...':this.killfeed.loaded?Math.round(this.killfeed.store['kills'] / this.killfeed.store['deads']):"Показать"}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'kills' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 0)">Убийств : {{this.killfeed.store['kills']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'kills' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 0)">Убийств : {{this.killfeed.store['kills']}}{{this.killfeed_current.store!=null?'/'+this.killfeed_current.store['kills']:''}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'assists' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 2)">Помощи : {{this.killfeed.store['assists']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'assists' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 2)">Помощи : {{this.killfeed.store['assists']}}{{this.killfeed_current.store!=null?'/'+this.killfeed_current.store['assists']:''}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'deads' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 1)">Смертей : {{this.killfeed.store['deads']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'deads' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 1)">Смертей : {{this.killfeed.store['deads']}}{{this.killfeed_current.store!=null?'/'+this.killfeed_current.store['deads']:''}}</p>
-        <p class="profile-text" style="text-align: right" v-if="this.killfeed.store !== null && 'suicides' in this.killfeed.store">Суицидов : {{this.killfeed.store['suicides']}}</p>
+        <p class="profile-text" style="text-align: right" v-if="this.killfeed.store !== null && 'suicides' in this.killfeed.store">Суицидов : {{this.killfeed.store['suicides']}}{{this.killfeed_current.store!=null?'/'+this.killfeed_current.store['suicides']:''}}</p>
         <MyKillsDialog ref="pc_mkd"/>
         <MessagesDialog ref="pc_md"/>
         <p class="profile-text clickable" style="text-align: right" v-if="'messages' in this.player" v-on:click="$refs.pc_md.showMe(true, player['steamids']['steam64'])">Сообщений : {{this.player['messages']}}</p>
@@ -160,6 +160,11 @@ export default {
       loading: false,
       loaded: false,
       store:null
+    },
+    killfeed_current: {
+      loading: false,
+      loaded: false,
+      store:null
     }
   }),
   methods: {
@@ -246,15 +251,18 @@ export default {
           .finally(() => this.altaccount.loading = false)
     },
     loadKillFeed(){
-      if (this.killfeed.store == null && this.killfeed.loading === false) {
+      if (this.killfeed.loading === false) {
         this.killfeed.loading = true;
+        this.killfeed_current.loading = true;
         axios.get(`api/profile/web?steam64=${this.player['steamids']['steam64']}&requests=killfeed` + Random.getRndWebAppend())
             .then(response => {
              this.killfeed.store = response.data['killfeed'];
+             this.killfeed_current.store = response.data["killfeed_current"];
              this.killfeed.loaded = true;
+             this.killfeed_current.loaded = true;
             })
-            .catch(() => this.killfeed.loaded = false)
+            .catch(() => {this.killfeed.loaded = false;this.killfeed_current.loaded=false;})
-            .finally(() => this.killfeed.loading = false)
+            .finally(() => {this.killfeed.loading = false;this.killfeed_current.loading=false;})
       }
     }
   }