Montag 18:45

bib-cockpit · Nov 27, 2023 · b3fad5c · b3fad5c
1 parent 3d9da18
commit b3fad5c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/src/datenstrukturen/projektpunktimagestruktur_server.ts b/src/datenstrukturen/projektpunktimagestruktur_server.ts
@@ -4,16 +4,18 @@ interface IProjektpunktimagestruktur  {
 
   FileID: string;
   WebUrl: string;
+  Filename: string;
+  Filesize: number;
 };
 
 const Projektpunktimageshema = new mongoose.Schema({
 
-  FileID: {type: String, required: false},
-  WebUrl: {type: String, required: false},
+  FileID:   {type: String, required: false},
+  WebUrl:   {type: String, required: false},
+  Filename: {type: String, required: false},
+  Filesize: {type: Number, required: false},
 
 });
 
 export { IProjektpunktimagestruktur, Projektpunktimageshema };
 
-
-// Hello World
diff --git a/src/datenstrukturen/thumbnailstrucktur_server.ts b/src/datenstrukturen/thumbnailstrucktur_server.ts
@@ -7,6 +7,7 @@ export type Thumbnailstruktur = {
   smallurl:  string;
   mediumurl: string;
   largeurl:  string;
+  size:      number;
   height: {
 
     small:  number;

diff --git a/src/datenstrukturen/urlaubsstruktur_server.ts b/src/datenstrukturen/urlaubsstruktur_server.ts
@@ -5,14 +5,24 @@ interface IUrlaubsstruktur  {
 
   Jahr:         number;
   Resturlaub:   number;
+  FreigeberID:  string;
   Zeitspannen:  IUrlauzeitspannenstruktur[];
+  Mitarbeiterliste: string[];
+  Stellvertreterliste: string[];
+  Ferienblockerliste: number[];
+  Feiertageblockerliste: number[];
 };
 
 const Urlaubsshema = new mongoose.Schema({
 
-  Jahr:           {type: Number,   required: false},
-  Resturlaub:     {type: Number,   required: false},
-  Zeitspannen:    [Urlaubszeitspannenshema]
+  Jahr:                  {type: Number,   required: false},
+  Resturlaub:            {type: Number,   required: false},
+  FreigeberID:           {type: String,   required: false},
+  Mitarbeiterliste:      {type: [String], required: false},
+  Stellvertreterliste:   {type: [String], required: false},
+  Ferienblockerliste:    {type: [Number], required: false},
+  Feiertageblockerliste: {type: [Number], required: false},
+  Zeitspannen:           [Urlaubszeitspannenshema]
 
 }, {_id: false});
 

diff --git a/src/datenstrukturen/urlauzeitspannenstruktur_server.ts b/src/datenstrukturen/urlauzeitspannenstruktur_server.ts
@@ -5,7 +5,6 @@ interface IUrlauzeitspannenstruktur {
   Startstempel: number;
   Endestempel:  number;
   VertreterID:  string;
-  FreigeberID:  string;
   Startstring:  string;
   Endestring:   string;
   Status:       string;
@@ -17,7 +16,6 @@ const Urlaubszeitspannenshema = new mongoose.Schema({
   Startstempel:   {type: Number,   required: false},
   Endestempel:    {type: Number,   required: false},
   VertreterID:    {type: String,   required: false},
-  FreigeberID:    {type: String,   required: false},
   Startstring:    {type: String,   required: false},
   Endestring:     {type: String,   required: false},
   Status:         {type: String,   required: false},

diff --git a/src/routes/saveloplisterouts.ts b/src/routes/saveloplisterouts.ts
@@ -805,6 +805,7 @@ export class SaveLOPListeroutsClass {
           fileid:    fileid,
           filename:  '',
           weburl:    weburl,
+          size:      0,
           mediumurl: getdata.value[0].medium.url,
           largeurl:  getdata.value[0].large.url,
           smallurl:  getdata.value[0].small.url,
@@ -905,6 +906,7 @@ export class SaveLOPListeroutsClass {
       mediumurl: "",
       smallurl: "",
       weburl: "",
+      size: 0,
       width: {large: 0, medium: 0, small: 0}
     };
   }

diff --git a/src/routes/saveprotokollerouts.ts b/src/routes/saveprotokollerouts.ts
@@ -280,8 +280,6 @@ export class SaveProtokolleroutsClass {
                       res.status(500).send({ Error: error.message });
                     }
 
-
-
                     let Image            = Buffer.from(Imagebuffuer).toString('base64');
                     Thumbnail.Content    = Image;
                   }
@@ -539,9 +537,6 @@ export class SaveProtokolleroutsClass {
       let endpoint   = this.Config.MICROSOFT_LOGIN_ENDPOINT;
       let Secret     = this.Config.CLIENT_APPLICATION_SECRET;
       let getdata: any;
-      let chunk: any;
-      let filebuffer = [];
-      let filedata;
       let graphClient;
       let msalClient;
       let tokenRequest;
@@ -593,6 +588,7 @@ export class SaveProtokolleroutsClass {
           fileid:    fileid,
           filename:  '',
           weburl:    weburl,
+          size:      0,
           mediumurl: getdata.value[0].medium.url,
           largeurl:  getdata.value[0].large.url,
           smallurl:  getdata.value[0].small.url,
@@ -629,6 +625,7 @@ export class SaveProtokolleroutsClass {
       mediumurl: "",
       smallurl: "",
       weburl: "",
+      size: 0,
       width: {large: 0, medium: 0, small: 0}
     };
   }