Fix #532 and #523

KevinGuancheDarias · Feb 15, 2024 · ba7c0cb · ba7c0cb
1 parent 216ce4c
commit ba7c0cb
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 12 deletions.
diff --git a/business/src/main/java/com/kevinguanchedarias/owgejava/dto/UnitRunningMissionDto.java b/business/src/main/java/com/kevinguanchedarias/owgejava/dto/UnitRunningMissionDto.java
@@ -27,6 +27,7 @@ public UnitRunningMissionDto(Mission mission, List<ObtainedUnit> involvedUnits)
         if (involvedUnits != null) {
             this.involvedUnits = findDtoService().convertEntireArray(ObtainedUnitDto.class, involvedUnits);
         }
+        invisible = mission.getInvisible();
         sourcePlanet = findDtoService().dtoFromEntity(PlanetDto.class, mission.getSourcePlanet());
         targetPlanet = findDtoService().dtoFromEntity(PlanetDto.class, mission.getTargetPlanet());
         var userEntity = mission.getUser();

diff --git a/game-frontend/CHANGELOG.md b/game-frontend/CHANGELOG.md
@@ -2,8 +2,10 @@
 # OWGE changelog
 v0.11.5 (latest)
 ====================
-* [class=Developer] __Improvement:__ Migrate to Spring Boot 3.0
+* [class=Developer] __Improvement:__ Migrate to Spring Boot 3.2
 * __Fix:__ [HAVE_UNIT requirement is removing the unlocked unit when you send all the units that are "required" to some mission, it should unlock it back when units come from that mission #516](https://github.com/KevinGuancheDarias/owge/issues/516) (previous fix not working on deploy missions)
+* __Improvememnt:__ [Allow to know that a mission is invisible to the mission sender user #532](https://github.com/KevinGuancheDarias/owge/issues/532)  
+* __Fix:__ [In Neon the gather reports don't show properly the resources, they have free width and height #523](https://github.com/KevinGuancheDarias/owge/issues/523)  
 
 v0.11.4 (2024-02-08 05:39)
 ==================

diff --git a/game-frontend/modules/owge-universe/src/lib/types/unit-running-mission.type.ts b/game-frontend/modules/owge-universe/src/lib/types/unit-running-mission.type.ts
@@ -11,6 +11,7 @@ import { RunningMission } from './running-mission.type';
  */
 export interface UnitRunningMission<U extends User = User> extends RunningMission {
     involvedUnits: ObtainedUnit[];
+    invisible: boolean;
     sourcePlanet?: Planet;
     targetPlanet?: Planet;
     user?: U;

diff --git a/...me-frontend/src/app/components/list-running-missions/list-running-missions.component.html b/...me-frontend/src/app/components/list-running-missions/list-running-missions.component.html
@@ -10,10 +10,17 @@
   <ng-container *ngFor="let runningUnitMission of runningUnitMissions">
     <div #missionRoot class="card owge auto-expand owge-list-running-missions"
       *ngIf="runningUnitMission.involvedUnits && runningUnitMission.involvedUnits.length">
-      <h3 *ngIf="displayUser" class="card-header">{{ 'APP.MISSION_LIST.HEADER_MISSION_TYPE_FROM_USER' |
-        translate:{missionType: runningUnitMission.type | displayMissionType | async, userName: runningUnitMission.user
-        | displayUsername} }} </h3>
-      <h3 *ngIf="!displayUser" class="card-header">{{ runningUnitMission.type | displayMissionType | async }}</h3>
+      <h3 *ngIf="displayUser" class="card-header">
+          <owge-widgets-display-image *ngIf="runningUnitMission.invisible || true" [assetsImage]="true" image="invisible.png"
+                                      [customClass]="'resourceImage'"></owge-widgets-display-image>
+          <span>
+              {{ 'APP.MISSION_LIST.HEADER_MISSION_TYPE_FROM_USER' | translate:{missionType: runningUnitMission.type | displayMissionType | async, userName: runningUnitMission.user| displayUsername} }}
+          </span>
+      </h3>
+      <h3 *ngIf="!displayUser" class="card-header">
+          <owge-widgets-display-image *ngIf="runningUnitMission.invisible || true" [assetsImage]="true" [customClass]="'resourceImage'" image="invisible.png"></owge-widgets-display-image>
+          <span>{{ runningUnitMission.type | displayMissionType | async }}</span>
+      </h3>
       <i *ngIf="isCancellable && runningUnitMission.type !== 'RETURN_MISSION'"
         (click)="cancelMission(runningUnitMission)" class="fas fa-times"></i>
       <span class="display-time">

diff --git a/...game-frontend/src/app/components/list-running-missions/list-running-missions.component.ts b/...game-frontend/src/app/components/list-running-missions/list-running-missions.component.ts
@@ -2,9 +2,8 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { ModalComponent } from '@owge/core';
 import { BaseComponent } from '../../base/base.component';
 import { UnitService } from '../../service/unit.service';
-import { MissionService } from '@owge/universe';
+import {MissionService, UnitRunningMission} from '@owge/universe';
 import { PlanetPojo } from '../../shared-pojo/planet.pojo';
-import { UnitRunningMission } from '../../shared/types/unit-running-mission.type';
 import { MissionInformationStore } from '../../store/mission-information.store';
 
 @Component({

diff --git a/game-frontend/shared/themes/classic/styles/modules/game-frontend/list-running-missions.scss b/game-frontend/shared/themes/classic/styles/modules/game-frontend/list-running-missions.scss
@@ -3,6 +3,11 @@
         width: 100%;
     }
     .owge-list-running-missions {
+        .resourceImage {
+            position: absolute;
+            top: -6px;
+            left: -5px;
+        }
         > h5 {
             font-size: 10pt;
         }
@@ -15,6 +20,10 @@
             margin-top: -10px;
             margin-left: -10px;
             margin-right: -10px;
+            padding-right: 20px;
+            > span {
+                padding-left: 28px;
+            }
         }
 
         > div.card-block {

diff --git a/game-frontend/shared/themes/neon/styles/modules/game-frontend/list-running-missions.sass b/game-frontend/shared/themes/neon/styles/modules/game-frontend/list-running-missions.sass
@@ -6,7 +6,7 @@
 
     .owge-list-running-missions
         color: silver
-        margin: 0px 5px
+        margin: 0 5px
         min-width: 155px
         &:hover
             &::before
@@ -24,12 +24,20 @@
             margin-top: -10px
             margin-left: -10px
             margin-right: -10px
+            > span
+                padding-left: 28px
+            .resourceImage
+                width: 32px
+                height: 32px
+                position: absolute
+                top: 0
+                left: 0
+                opacity: 0.4
 
         > div.card-block
             .btn-move-units
-                margin-top: 0px
-                margin-bottom: 0px
-
+                margin-top: 0
+                margin-bottom: 0
             > .card-title
                 text-align: center
                 margin-top: 11px

diff --git a/game-frontend/shared/themes/neon/styles/theme_overrides.sass b/game-frontend/shared/themes/neon/styles/theme_overrides.sass
@@ -40,6 +40,9 @@ body.owge-theme-neon
     .disabled-for-offline,a.disabled-btn
         cursor: not-allowed
 
+    .resourceImage
+        width: 25px
+        height: 25px
     .owge-theme-color
         color: $bgColor
     .owge-theme-color-alt
@@ -175,7 +178,7 @@ body.owge-theme-neon
                 z-index: -1
                 opacity: 1
                 filter: grayscale(90%) blur(2px)
-            img
+            img:not(.resourceImage)
                 width: 130px
                 height: 110px
                 filter: drop-shadow(2px 0px 4px $neonShadow01)