Meet final p3

frontend/sitcomm/src/app/app.module.ts

@@ -31,6 +31,7 @@ import { MatExpansionModule} from '@angular/material/expansion';
 import { MatDialogModule } from '@angular/material/dialog';
 import { CreateTicketDialog } from './jira/jira.component';
 
+
 @NgModule({
   declarations: [
     AppComponent,

frontend/sitcomm/src/app/github/github.component.html

@@ -18,10 +18,10 @@
             </mat-expansion-panel-header>
             <div>
             <mat-form-field class="form-field-css">
-                <textarea matInput class="file-text" type="text" readonly="True" [rows]="file.url.split('\n').length" [(ngModel)]="file.url"></textarea>
+                <textarea matInput class="file-text" type="text" readonly="True" [rows]="file.content.split('\n').length" [(ngModel)]="file.content"></textarea>
             </mat-form-field>
             <button mat-raised-button color="primary" style="margin-right: 10px;" (click)="allowEditFile()">Edit</button>
-            <button mat-raised-button color="primary" (click)="submitFile(file.id,file.url)">Save</button>
+            <button mat-raised-button color="primary" (click)="submitFile(file.id,file.content)">Save</button>
             </div>
         </mat-expansion-panel>
     </mat-list-item>

frontend/sitcomm/src/app/github/github.component.ts

@@ -7,14 +7,13 @@ import { HttpClient } from '@angular/common/http';
 import { Router } from '@angular/router';
 import { CookieService } from 'ngx-cookie-service';
 
-
 export interface entry{
-  id: number;
+  id: string;
   name: string;
   commitMessage: string;
   commitDate: Date;
   type: string;
-  url: string;
+  content: string;
 }
 
 export interface Section {
@@ -31,6 +30,7 @@ export interface Section {
 })
 export class GithubComponent implements OnInit {
   projectId = '';
+  git_id = '';
   getGitFiles_stat$ = new Observable<getGitFilesResponse>;
   postFileChange_stat$ = new Observable<postFileChangesResponse>;
 
@@ -39,24 +39,32 @@ export class GithubComponent implements OnInit {
   fetchData(id: string) {
     //return dummy data of type entry
     var files:entry[] = [
-      {id: 1, name: "test", commitMessage: "test", commitDate: new Date('1/27/2022'), type: "folder", url: "test\n".repeat(10)},
-      {id: 2, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", url: "test"},
-      {id: 3, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", url: "test"},
-      {id: 4, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", url: "test"},
-      {id: 5, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", url: "test"},
-      {id: 6, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", url: "test"},
-      {id: 7, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", url: "test"},
-      {id: 8, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", url: "test"},
-      {id: 9, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", url: "test"},
-      {id: 10, name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", url: "test"},
+      {id: '1', name: "test", commitMessage: "test", commitDate: new Date('1/27/2022'), type: "folder", content: "test\n".repeat(10)},
+      {id: '2', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", content: "test"},
+      {id: '3', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", content: "test"},
+      {id: '4', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", content: "test"},
+      {id: '5', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "folder", content: "test"},
+      {id: '6', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", content: "test"},
+      {id: '7', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", content: "test"},
+      {id: '8', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", content: "test"},
+      {id: '9', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", content: "test"},
+      {id: '10', name: "test", commitMessage: "test", commitDate: new Date('1/1/2022'), type: "file", content: "test"},
     ]
     return files;
   }
-  submitFile(id: number,data: string) {
+  submitFile(id: string,data: string) {
     //submit data to server
     console.log("submitting file");
     console.log(data);
     console.log(data.split("\n").length);
+    this.postFileChange_stat$ = this.http.post<postFileChangesResponse>(POST_FILE_CHANGE_API,{
+      "pid": this.projectId,
+      "file_id": id,
+      "content": data
+    });
+    this.postFileChange_stat$.subscribe((data) => {
+      console.log(data);
+    });
     for (let i = 0; i < document.getElementsByClassName("file-text").length; i++) {
       document.getElementsByClassName("file-text")[i].setAttribute("readonly", "true");
     }
@@ -66,6 +74,7 @@ export class GithubComponent implements OnInit {
       document.getElementsByClassName("file-text")[i].removeAttribute("readonly");
     }
   }
+  //files: entry[] = this.fetchData(this.projectId);
   files: entry[] = this.fetchData(this.projectId);
 
   ngOnInit(): void {
@@ -74,10 +83,23 @@ export class GithubComponent implements OnInit {
     console.log(this.projectId);
     this.getGitFiles_stat$ = this.http.get<getGitFilesResponse>(GET_GIT_FILES_API+'?pid=' +this.projectId);
     this.getGitFiles_stat$.subscribe((data) => {
-      console.log(data);
+      //console.log(data);
       if (data.status == true) {
-        console.log("success");
-        console.log(data.files);
+        this.git_id = data.files[0].git_id;
+        //console.log(this.git_id);
+        this.http.get('assets/'+this.git_id, {responseType: 'text'}).subscribe((data) => {
+          //console.log(data);
+          var files:entry[] = [];
+          var lines = data.split("\n");
+          for (let i = 0; i < lines.length; i++) {
+            var line = lines[i].split(",");
+            var file:entry = {id: line[0], name: line[1], commitMessage: line[2], commitDate: new Date(line[3]), type: line[4], content: line[5]};
+            files.push(file);
+          }
+          this.files = files;
+          this.files.pop();
+          this.files.shift();
+        });
       }
       else {
         console.log("failure");

frontend/sitcomm/src/assets/uid-1.csv

 id,name,commitMessage,commitDate,type,content
-1,File1,updatedFiles,10-05-22,file,"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?"
-2,File2,Merged files,11-10-22,file,"""At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."""
-3,File3,updatedFiles,10-05-22,file,"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?"
-4,File4,Merged files,11-10-22,file,"""At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."""
-5,File5,updatedFiles,10-05-22,file,"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?"
+1,File 1,File changed,2022-11-21 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+2,File 2,File changed,2022-11-20 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+3,File 3,File changed,2022-11-02 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+4,File 4,File changed,2021-11-03 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+5,File 5,File changed,2022-11-21 12:28:22.1512+05:30,file,1
+6,File 6,File changed,2022-11-12 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident

frontend/sitcomm/src/assets/uid-1.csv~

-id,name,commitMessage,commitDate,type,content,

frontend/sitcomm/src/uid-1.csv

+id,name,commitMessage,commitDate,type,content
+1,File 1,File changed,2022-11-21 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+2,File 2,File changed,2022-11-20 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+3,File 3,File changed,2022-11-02 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+4,File 4,File changed,2021-11-03 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+5,File 5,File changed,2022-11-21 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident
+6,File 6,File changed,2022-11-12 12:28:22.1512+05:30,file,At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident

sitcomm/api/views.py

@@ -172,24 +172,52 @@ class getGitFilesViewSet(views.APIView):
 class postFileChangeViewSet(views.APIView):
     def post(self,request):
         pid = request.data.get('pid')
-        file = request.data.get('file')
-        data = request.data.get('data')
+        file = request.data.get('file_id')
+        data = request.data.get('content')
         try:
             project = Projects.objects.filter(pid=pid)
-            if project is None:
+            if len(project) == 0:
                 return Response({'status':False})
             git_id = project.values('git_id')[0]['git_id']
-            with open (git_id,'a') as f:
+            relative_path = '../frontend/sitcomm/src/assets/'
+            #print(os.getcwd())
+            git_id = relative_path + git_id
+            #print(git_id)
+            orig_file = open(git_id,'r')
+            orig_dt = csv.DictReader(orig_file)
+            update_file = []
+            for line in orig_dt:
+                #print(line)
+                print(line['id'],file)
+                if line['id'] == file:
+                    line['content'] = data
+                update_file.append(line)
+            orig_file.close()
+            #print(git_id)
+            orig_file = open(git_id,'w')
+            headers = ['id','name','commitMessage','commitDate','type','content']
+            data = csv.DictWriter(orig_file,fieldnames=headers,delimiter=',')
+            data.writerow(dict((fn,fn) for fn in headers))
+            data.writerows(update_file)
+            print(update_file)
+            orig_file.close()
+
+            '''
+            with open (git_id,'w+') as f:
+                print("Writing to file")
+                print(git_id)
                 csvFile = csv.reader(f)
                 for row in csvFile:
+                    print(row)
                     if row[0] == file:
                         row[1] = data
-                        break
-                writer = csv.writer(f)
-                writer.writerow(row)
+                        writer = csv.writer(f)
+                        writer.writerow(row)
+                        print(row)
+            '''
             return Response({'status':True})
         except Exception as e:
-            print(e)
+            print("error",e)
             return Response({'status':False})
 
 class postFileCreateViewSet(views.APIView):