Merge branch 'task/add-delete-campaign-funct' of hardi/opt-cc into master

api/routes/campaigns.js

@@ -13,6 +13,8 @@ const checkMT = require('../middleware/permission-check').checkMT;
 
 // Mongoose Model using mongoDB
 const CampaignModel = require('../models/campaign');
+const WarModel = require('../models/war');
+
 
 const campaigns = express.Router();
 
@@ -54,6 +56,25 @@ campaigns.route('/:id')
       return next();
     });
   })
+
+  .delete((req, res, next) => {
+    CampaignModel.findByIdAndRemove(req.params.id, (err, item) => {
+      if (err) {
+        err.status = codes.wrongrequest;
+        return next(err);
+      }
+      else if (!item) {
+        err = new Error("item not found");
+        err.status = codes.notfound;
+        return next(err);
+      }
+      WarModel.find({campaign: req.params.id}).remove().exec();
+
+      res.locals.processed = true;
+      next();
+    })
+  })
+
   .all(
     routerHandling.httpMethodNotAllowed
   );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "license": "MIT",
   "private": true,
   "scripts": {

static/src/app/app.config.ts

@@ -14,6 +14,7 @@ export class AppConfig {
   public readonly apiRequestAwardPath = this.apiUrl + '/request/award';
   public readonly apiPromotionPath = this.apiUrl + '/request/promotion';
   public readonly apiWarPath = this.apiUrl + '/wars';
+  public readonly apiCampaignPath = this.apiUrl + '/campaigns';
 
 }
 

static/src/app/services/campaign-service/campaign.service.ts

@@ -0,0 +1,31 @@
+import {Injectable} from "@angular/core";
+import {Campaign} from "../../models/model-interfaces";
+import {AppConfig} from "../../app.config";
+import {HttpClient} from "../http-client";
+
+@Injectable()
+export class CampaignService {
+
+  campaigns: Campaign[];
+
+  constructor(private http: HttpClient,
+              private config: AppConfig) {
+  }
+
+  getAllCampaigns() {
+    return this.http.get(this.config.apiWarPath)
+      .map(res => res.json())
+  }
+
+  submitCampaign(campaign: Campaign) {
+    return this.http.post(this.config.apiCampaignPath, campaign)
+      .map(res => res.json())
+  }
+
+  deleteCampaign(id: string) {
+    return this.http.delete(this.config.apiCampaignPath + '/' + id)
+      .map(res => res.json())
+  }
+
+}
+

static/src/app/services/war-service/war.service.ts

@@ -1,22 +1,15 @@
 import {Injectable} from "@angular/core";
-import {Campaign, War} from "../../models/model-interfaces";
+import {War} from "../../models/model-interfaces";
 import {AppConfig} from "../../app.config";
 import {HttpClient} from "../http-client";
 
 @Injectable()
 export class WarService {
 
-  campaigns: Campaign[];
-
   constructor(private http: HttpClient,
               private config: AppConfig) {
   }
 
-  getAllCampaigns() {
-    return this.http.get(this.config.apiWarPath)
-      .map(res => res.json())
-  }
-
   getWar(warId: string) {
     return this.http.get(this.config.apiWarPath + '/' + warId)
       .map(res => res.json())

static/src/app/statistic/campaign-submit/campaign-submit.component.css

@@ -0,0 +1,8 @@
+.overview {
+  position: fixed;
+  width: 25%;
+  min-width: 300px;
+  padding-left: 50px;
+  padding-top: 70px;
+  margin-left: 10px;
+}

static/src/app/statistic/campaign-submit/campaign-submit.component.html

@@ -0,0 +1,33 @@
+<form #form="ngForm" class="overview">
+  <h3>Kampagne hinzufügen</h3>
+
+  <div class="form-group">
+    <label for="title">Titel</label>
+    <input type="text" class="form-control"
+           [(ngModel)]="campaign.title"
+           name="title"
+           id="title"
+           required maxlength="50"/>
+
+    <show-error text="Name" path="title"></show-error>
+  </div>
+
+  <button id="cancel"
+          (click)="cancel()"
+          class="btn btn-default">
+    Abbrechen
+  </button>
+
+  <button id="save"
+          (click)="saveCampaign()"
+          class="btn btn-default"
+          [disabled]="!form.valid">
+    Bestätigen
+  </button>
+
+  <span *ngIf="showErrorLabel"
+        class="center-block label label-danger" style="font-size: medium; padding: 2px; margin-top: 2px">
+        {{error}}
+      </span>
+
+</form>

static/src/app/statistic/campaign-submit/campaign-submit.component.ts

@@ -0,0 +1,44 @@
+import {Component, ViewChild} from "@angular/core";
+import {ActivatedRoute, Router} from "@angular/router";
+import {NgForm} from "@angular/forms";
+import {Campaign} from "../../models/model-interfaces";
+import {CampaignService} from "../../services/campaign-service/campaign.service";
+
+
+@Component({
+  selector: 'campaign-submit',
+  templateUrl: './campaign-submit.component.html',
+  styleUrls: ['./campaign-submit.component.css']
+})
+export class CampaignSubmitComponent {
+
+  campaign: Campaign = {};
+
+  showErrorLabel = false;
+
+  error;
+
+  @ViewChild(NgForm) form: NgForm;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private campaignService: CampaignService) {
+  }
+
+  saveCampaign() {
+    this.campaignService.submitCampaign(this.campaign)
+      .subscribe(campaign => {
+          this.router.navigate(['../overview/' + campaign._id], {relativeTo: this.route});
+        },
+        error => {
+          this.error = error._body.error.message;
+          this.showErrorLabel = true;
+        });
+  }
+
+  cancel() {
+    this.router.navigate(['..'], {relativeTo: this.route});
+    return false;
+  }
+
+}

static/src/app/statistic/overview/stats-overview.component.ts

@@ -1,7 +1,7 @@
 import {Component} from "@angular/core";
-import {WarService} from "../../services/war-service/war.service";
 import {ActivatedRoute} from "@angular/router";
 import {CarouselConfig} from "ngx-bootstrap";
+import {CampaignService} from "../../services/campaign-service/campaign.service";
 
 
 @Component({
@@ -26,7 +26,7 @@ export class StatisticOverviewComponent {
   };
 
   constructor(private route: ActivatedRoute,
-              private warService: WarService) {
+              private campaignService: CampaignService) {
   }
 
   ngOnInit() {
@@ -34,10 +34,10 @@ export class StatisticOverviewComponent {
       .map(params => params['id'])
       .subscribe((id) => {
         this.id = id;
-        if (this.warService.campaigns) {
+        if (this.campaignService.campaigns) {
-          this.initWars(this.warService.campaigns);
+          this.initWars(this.campaignService.campaigns);
         } else {
-          this.warService.getAllCampaigns().subscribe(campaigns => {
+          this.campaignService.getAllCampaigns().subscribe(campaigns => {
             this.initWars(campaigns);
           })
         }

static/src/app/statistic/stats.module.ts

@@ -5,13 +5,14 @@ import {statsRouterModule, statsRoutingComponents} from "./stats.routing";
 import {WarService} from "../services/war-service/war.service";
 import {LineChartModule, PieChartModule} from "@swimlane/ngx-charts";
 import {AccordionModule, CarouselModule} from "ngx-bootstrap";
+import {CampaignService} from "../services/campaign-service/campaign.service";
 import {NgxDatatableModule} from "@swimlane/ngx-datatable";
 
 @NgModule({
   declarations: statsRoutingComponents,
   imports: [CommonModule, SharedModule, statsRouterModule, LineChartModule, PieChartModule,
     AccordionModule.forRoot(), CarouselModule.forRoot(), NgxDatatableModule],
-  providers: [WarService]
+  providers: [WarService, CampaignService]
 })
 export class StatsModule {
   static routes = statsRouterModule;

static/src/app/statistic/stats.routing.ts

@@ -6,6 +6,7 @@ import {WarListComponent} from "./war-list/war-list.component";
 import {StatisticOverviewComponent} from "./overview/stats-overview.component";
 import {WarItemComponent} from "./war-list/war-item.component";
 import {ModuleWithProviders} from "@angular/core";
+import {CampaignSubmitComponent} from "./campaign-submit/campaign-submit.component";
 
 
 export const statsRoutes: Routes = [{
@@ -22,6 +23,11 @@ export const statsRoutes: Routes = [{
     component: StatisticOverviewComponent,
     outlet: 'right'
   },
+  {
+    path: 'new-campaign',
+    component: CampaignSubmitComponent,
+    outlet: 'right'
+  },
   {
     path: 'new',
     component: WarSubmitComponent,
@@ -35,6 +41,6 @@ export const statsRoutes: Routes = [{
 
 export const statsRouterModule: ModuleWithProviders = RouterModule.forChild(statsRoutes);
 
-export const statsRoutingComponents = [StatisticComponent, StatisticOverviewComponent, WarListComponent,
+export const statsRoutingComponents = [StatisticComponent, StatisticOverviewComponent, CampaignSubmitComponent,
-  WarSubmitComponent, WarDetailComponent, WarItemComponent];
+  WarListComponent, WarSubmitComponent, WarDetailComponent, WarItemComponent];
 

static/src/app/statistic/war-detail/war-detail.component.css

@@ -2,6 +2,7 @@
   position: fixed;
   overflow-y: scroll;
   overflow-x: hidden;
+  border-left: thin solid lightgrey;
   bottom: 20px;
   width: 100%;
   padding-left: 50px;

static/src/app/statistic/war-list/war-list.component.css

@@ -3,7 +3,8 @@
 }
 
 :host /deep/ .card-header {
-  background-color: slategray;
+  background-color: rgba(34, 34, 34, 0.80);
+  cursor: pointer;
   padding: 15px;
   color: white;
   font-weight: 600;

static/src/app/statistic/war-list/war-list.component.html

@@ -1,15 +1,23 @@
 <div class="war-list">
-  <div class="input-group search-bar" style="margin-bottom:12px" *ngIf="loginService.hasPermission(3)">
+  <div class="input-group search-bar" style="margin-bottom:12px; width:100%;" *ngIf="loginService.hasPermission(3)">
     <a class="pull-left btn btn-success" (click)="selectNewWar()">
       Schlacht hinzufügen
     </a>
+    <a class="pull-right btn btn-success" (click)="selectNewCampaign()">
+      Kampagne hinzufügen
+    </a>
   </div>
 
   <accordion *ngFor="let campaign of campaigns; let isFirstRow=first">
     <accordion-group [isOpen]="isFirstRow">
-      <div accordion-heading (click)="selectOverview(campaign._id)">
+      <div accordion-heading>
         {{campaign.title}}
         <span class="pull-right">▼</span>
+        <span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
+              style="color: whitesmoke; padding-top: 0; padding-right: 20px;"
+              class="glyphicon glyphicon-trash trash pull-right"
+              *ngIf="loginService.hasPermission(3)">
+        </span>
       </div>
 
       <div class="fade-in list-entry" style="margin-top: -16px; margin-bottom: 10px;"

static/src/app/statistic/war-list/war-list.component.ts

@@ -3,6 +3,7 @@ import {ActivatedRoute, Router} from "@angular/router";
 import {Campaign, War} from "../../models/model-interfaces";
 import {WarService} from "../../services/war-service/war.service";
 import {LoginService} from "../../services/login-service/login-service";
+import {CampaignService} from "../../services/campaign-service/campaign.service";
 
 @Component({
   selector: 'war-list',
@@ -16,19 +17,25 @@ export class WarListComponent implements OnInit {
   campaigns: Campaign[] = [];
 
   constructor(private warService: WarService,
+              private campaignService: CampaignService,
               private loginService: LoginService,
               private router: Router,
               private route: ActivatedRoute) {
   }
 
   ngOnInit() {
-    this.warService.getAllCampaigns().subscribe((items) => {
+    this.campaignService.getAllCampaigns().subscribe((items) => {
-      this.warService.campaigns = items;
+      this.campaignService.campaigns = items;
       this.campaigns = items;
       this.selectOverview(this.campaigns[0]._id);
     });
   }
 
+  selectNewCampaign() {
+    this.selectedWarId = null;
+    this.router.navigate([{outlets: {'right': ['new-campaign']}}], {relativeTo: this.route});
+  }
+
   selectNewWar() {
     this.selectedWarId = null;
     this.router.navigate([{outlets: {'right': ['new']}}], {relativeTo: this.route});
@@ -60,4 +67,17 @@ export class WarListComponent implements OnInit {
     }
   }
 
+  deleteCampaign(campaign) {
+    if (confirm('Soll die Kampagne ' + campaign.title + ' wirklich gelöscht werden?')) {
+      this.campaignService.deleteCampaign(campaign._id)
+        .subscribe((res) => {
+          console.log(res)
+          if (this.selectedWarId === campaign._id) {
+            this.selectOverview('all');
+          }
+          this.campaigns.splice(this.campaigns.indexOf(campaign), 1);
+        })
+    }
+  }
+
 }

static/src/app/statistic/war-submit/war-submit.component.css

@@ -6,24 +6,3 @@
   padding-top: 70px;
   margin-left: 10px;
 }
-
-.load-arrow {
-  background: url(../../../assets/loading.png) no-repeat;
-  display: block;
-  width: 120px;
-  height: 120px;
-}
-
-/* Loading Animation */
-.glyphicon-refresh-animate {
-  animation: spin 1.5s linear infinite;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}

static/src/app/statistic/war-submit/war-submit.component.html

@@ -49,7 +49,7 @@
             id="campaign"
             [(ngModel)]="war.campaign"
             required>
-      <option *ngFor="let campaign of warService.campaigns" [ngValue]="campaign._id">
+      <option *ngFor="let campaign of campaignService.campaigns" [ngValue]="campaign._id">
         {{campaign.title}}
       </option>
     </select>

static/src/app/statistic/war-submit/war-submit.component.ts

@@ -3,6 +3,7 @@ import {ActivatedRoute, Router} from "@angular/router";
 import {NgForm} from "@angular/forms";
 import {WarService} from "../../services/war-service/war.service";
 import {War} from "../../models/model-interfaces";
+import {CampaignService} from "../../services/campaign-service/campaign.service";
 
 
 @Component({
@@ -28,7 +29,8 @@ export class WarSubmitComponent {
 
   constructor(private route: ActivatedRoute,
               private router: Router,
-              private warService: WarService) {
+              private warService: WarService,
+              private campaignService: CampaignService) {
   }
 
   fileChange(event) {