Fixed bugs

md-systems · Aug 4, 2021 · ddd9199 · ddd9199
1 parent c723c22
commit ddd9199
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,6 @@ venv/
 .ipynb_checkpoints
 
 d3-country-bubble-chart-master
-oss-github-benchmark.json
-oss-github-benchmark.csv
 
 dist
 node_modules

diff --git a/assets/oss-github-benchmark.csv b/assets/oss-github-benchmark.csv
diff --git a/assets/oss-github-benchmark.json b/assets/oss-github-benchmark.json
diff --git a/data-gathering/OSS_github_benchmark.py b/data-gathering/OSS_github_benchmark.py
@@ -117,8 +117,6 @@ def badStuff(dic):
     # Von allen Branchen die Institutionen (Firmen, Behörden, Communities...) rausholen
     while j < len(sector["institutions"]):
         institution = sector["institutions"][j]
-        j += 1
-        print(j)
         institution_data = {
             "uuid": institution["uuid"],
             "shortname": institution["shortname"],
@@ -169,6 +167,8 @@ def badStuff(dic):
                             "name": "",
                             "uuid": str(uuid.uuid4()),
                             "url": "",
+                            "institution": institution_data["shortname"],
+                            "organization": organization_data["name"],
                             "fork": False,
                             "archived": False,
                             "num_forks": 0,
@@ -374,7 +374,7 @@ def badStuff(dic):
                             organization_data["total_num_forks_in_repos"] += 1
                             organization_data["total_num_commits"] += repo_data["has_own_commits"]
                     except RuntimeError as error:
-                        print("Fehler beim Laden der Daten von '" + repo.name + "' : " + error)
+                        print("Fehler beim Laden der Daten von '" + repo.name + "' : " + str(error))
                         try:
                             badStuff(repo)
                         except:
@@ -405,9 +405,9 @@ def badStuff(dic):
                     badStuff(repo)
                 except:
                     try:
-                        badStuff({"error": f"error in repo {repo.name} of org {org_name}"})
-                    except:
                         badStuff({"error": f"error in org {org_name}"})
+                    except () as e:
+                        badStuff({"error": f"{str(e)}"})
                 traceback.print_exc()
         print("Anzahl GitHub Repos von " + institution["name_de"] + ": " + str(institution_data["num_repos"]))
         institutions_data.append(institution_data)
@@ -428,6 +428,7 @@ def badStuff(dic):
         collectionInstitutions.replace_one({ "uuid" : institution_data["uuid"] }, institution_data, upsert=True)
         if len(institution_data["repos"]) != 0:
             collectionRepositoriesNew.insert_many(institution_data["repos"])
+        j += 1
         saveProgress()
     i += 1
     j = 0

diff --git a/data-gathering/github_repos.json b/data-gathering/github_repos.json
@@ -565,7 +565,6 @@
           "name_de": "Swisscom",
           "orgs": [
             "swisscom",
-            "ScsApiTribe",
             "SwisscomTrustServices",
             "swisscom-developer",
             "sinso",
@@ -587,7 +586,7 @@
           "uuid": "137478fc-ee92-43a4-94f7-c3df17c42a4c",
           "shortname": "alv",
           "name_de": "Arbeitslosenversicherung",
-          "orgs": ["alv-ch", "alv-ch-ansible-roles"]
+          "orgs": ["alv-ch"]
         },
         {
           "uuid": "53795f08-ac6e-4aa4-a780-9283b20f958f",

diff --git a/frontend/src/app/explore/explore-item/explore-item.component.html b/frontend/src/app/explore/explore-item/explore-item.component.html
@@ -39,6 +39,12 @@ <h2>Repos:</h2>
           {{ repo.name }}
         </td>
       </ng-container>
+      <ng-container matColumnDef="organization">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Organization</th>
+        <td mat-cell *matCellDef="let repo" (click)="navigateTo(repo.url)">
+          {{ repo.organization }}
+        </td>
+      </ng-container>
 
       <ng-container matColumnDef="num_commits">
         <th mat-header-cell *matHeaderCellDef mat-sort-header class="number">

diff --git a/frontend/src/app/explore/explore-item/explore-item.component.ts b/frontend/src/app/explore/explore-item/explore-item.component.ts
@@ -23,6 +23,7 @@ export class ExploreItemComponent implements OnInit, AfterViewInit {
   item: IInstitution;
   displayedColumns: string[] = [
     'name',
+    'organization',
     'num_commits',
     'num_contributors',
     'num_watchers',