diff --git a/Custom_Templates/customer_templates/Crayon/onboarding.html.liquid b/Custom_Templates/customer_templates/Crayon/onboarding.html.liquid new file mode 100644 index 00000000..0c20f3ac --- /dev/null +++ b/Custom_Templates/customer_templates/Crayon/onboarding.html.liquid @@ -0,0 +1,30 @@ +{% include "header" %} +{% include "course_version_outdated_alert", courses: courses.enrolled %} +{% include "sub_navigation" %} +
+
+
+ {% if features.learning_paths? %} +
+ {% t shared.learning_paths %} +
+ {% include "learning_paths_index", items: learning_paths.enrolled %} + {% endif %} +
+ {% t shared.course_vocabulary.plural, key: current_school.course_vocabulary %} +
+ {% include "courses_index", class: "col-xs-12 col-sm-6 np-stretch-content" %} +
+ {% if features.training_events? %} +
+
+ {% t .upcoming_events %} +
+ {% include "training_events_dashboard" %} +
+ {% endif %} +
+
+{% include "footer" %} + +current_page: "/app/user-guides" \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/.DS_Store b/Custom_Templates/customer_templates/Zenjob/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/Custom_Templates/customer_templates/Zenjob/.DS_Store differ diff --git a/Custom_Templates/customer_templates/Zenjob/_cards_course.html.liquid b/Custom_Templates/customer_templates/Zenjob/_cards_course.html.liquid index 99c6af41..722d6f5c 100644 --- a/Custom_Templates/customer_templates/Zenjob/_cards_course.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_cards_course.html.liquid @@ -1,3 +1,4 @@ +{% assign course_ribbon = course.ribbon | downcase %}
@@ -26,8 +27,8 @@ {% endif %}
{% capture course_path %}{% route course, id: course.id %}{% endcapture %} - - {% if course.name == "Gesundheitszeugnis" or course.id == "061147ec-5a19-4bda-b439-1ba9bcd24fe9" %} + + {% if course_ribbon == "hochladen" %} Hochladen @@ -39,19 +40,21 @@ {% if course.enrolled? %} - {% if course.has_to_restart? %} - {% include "course_version_outdated_popup", path: course_path %} - {% endif %} -
- {% if course.completed? %} - Abgeschlossen - {% elsif course.started? == false %} - 0% abgeschlossen - {% else %} - {% comment %} {{ course.progress }}% Abgeschlossen {% endcomment %} - {% t shared.progress, count: course.progress %} + {% unless course_ribbon == "demnächst" or course.name == "Neue Lerninhalte" %} + {% if course.has_to_restart? %} + {% include "course_version_outdated_popup", path: course_path %} {% endif %} -
+
+ {% if course.completed? %} + Abgeschlossen + {% elsif course.started? == false %} + 0% abgeschlossen + {% else %} + {% comment %} {{ course.progress }}% Abgeschlossen {% endcomment %} + {% t shared.progress, count: course.progress %} + {% endif %} +
+ {% endunless %} {% endif %}
diff --git a/Custom_Templates/customer_templates/Zenjob/_cards_learning_path.html.liquid b/Custom_Templates/customer_templates/Zenjob/_cards_learning_path.html.liquid new file mode 100644 index 00000000..e322d058 --- /dev/null +++ b/Custom_Templates/customer_templates/Zenjob/_cards_learning_path.html.liquid @@ -0,0 +1,68 @@ +
+
+
+
+ {{ learning_path.name }} +
+ + {{ learning_path.items.count }} Inhalte +
+
+ +
+ +
+

+ {{ learning_path.name }} +

+ + {% include "learning_path_description" %} + + {% if learning_path.has_instructors? %} +
+ {{ learning_path.instructor_names }} +
+ {% endif %} + +
+ + {{ learning_path.items.count }} Inhalte +
+ +
+ + Weiter + Weiter + + {% if learning_path.enrolled? %} +
+ {% if learning_path.completed? %} + Abgeschlossen + {% elsif learning_path.started? == false %} + 0% abgeschlossen + {% else %} + {% t shared.progress, count: learning_path.progress %} + {% endif %} +
+ {% endif %} +
+
+
+
+
+
+
+
+
+
diff --git a/Custom_Templates/customer_templates/Zenjob/_course_cta_button.html.liquid b/Custom_Templates/customer_templates/Zenjob/_course_cta_button.html.liquid index ee367268..5510972d 100644 --- a/Custom_Templates/customer_templates/Zenjob/_course_cta_button.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_course_cta_button.html.liquid @@ -16,14 +16,19 @@ {% endif %} {% endunless %} > - {% if course.enrolled? == false %} - {% t shared.enroll %} - {% elsif course.started? == false %} - {% t shared.course.start, key: current_school.course_vocabulary %} - {% elsif course.completed? %} - {% t shared.course.view, key: current_school.course_vocabulary %} + {% assign course_ribbon = course.ribbon | downcase %} + {% if course_ribbon == "hochladen" %} + Hochladen {% else %} - {% t shared.continue %} + {% if course.enrolled? == false %} + {% t shared.enroll %} + {% elsif course.started? == false %} + {% t shared.course.start, key: current_school.course_vocabulary %} + {% elsif course.completed? %} + {% t shared.course.view, key: current_school.course_vocabulary %} + {% else %} + {% t shared.continue %} + {% endif %} {% endif %} {% endif %} \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/_header.html (1) (1).liquid b/Custom_Templates/customer_templates/Zenjob/_header.html (1) (1).liquid deleted file mode 100644 index 405f9b56..00000000 --- a/Custom_Templates/customer_templates/Zenjob/_header.html (1) (1).liquid +++ /dev/null @@ -1,385 +0,0 @@ -{% assign is_in_authenticated_group = false %} - -{% for group in current_person.groups %} - {% if group.name == "All Users" or group.id == "6331d115-ea74-418a-99b2-af5c81208fe1" %} - {% assign is_in_authenticated_group = true %} - {% endif %} -{% endfor %} - -{% if current_person.email contains "+preview" %} - {% assign is_in_authenticated_group = true %} -{% endif %} - -{% unless is_in_authenticated_group %} - -{% endunless %} - -
-
-
- {% if current_person.signed_in? %} - - - {% endif %} -
- {% if current_school.logo_url %} -

- - {{ current_school.name }} - -

- {% else %} - - {{ current_school.name }} - - {% endif %} - -
- -
- - {% if current_person.signed_in? %} -
-
- - -
-
-
- - -
- {% else %} -
- - -
- Trainings - - - - Lernweg - - - - Auszeichnungen - - - - On-The-Job Videos - - - {% comment %} - Veranstaltungen - {% endcomment %} - -
- {% unless current_school.sso_active? %} - - {% t .profile_settings %} - - {% endunless %} - - {% t .sign_out %} - -
-
-
- -{% include "messages" %} - - - - \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/_header.html (1).liquid b/Custom_Templates/customer_templates/Zenjob/_header.html (1).liquid deleted file mode 100644 index 405f9b56..00000000 --- a/Custom_Templates/customer_templates/Zenjob/_header.html (1).liquid +++ /dev/null @@ -1,385 +0,0 @@ -{% assign is_in_authenticated_group = false %} - -{% for group in current_person.groups %} - {% if group.name == "All Users" or group.id == "6331d115-ea74-418a-99b2-af5c81208fe1" %} - {% assign is_in_authenticated_group = true %} - {% endif %} -{% endfor %} - -{% if current_person.email contains "+preview" %} - {% assign is_in_authenticated_group = true %} -{% endif %} - -{% unless is_in_authenticated_group %} - -{% endunless %} - -
-
-
- {% if current_person.signed_in? %} - - - {% endif %} -
- {% if current_school.logo_url %} -

- - {{ current_school.name }} - -

- {% else %} - - {{ current_school.name }} - - {% endif %} - -
- -
- - {% if current_person.signed_in? %} -
-
- - -
-
-
- - -
- {% else %} -
- - -
-
- Trainings - - - - Lernweg - - - - Auszeichnungen - - - - On-The-Job Videos - - - {% comment %} - Veranstaltungen - {% endcomment %} - -
- {% unless current_school.sso_active? %} - - {% t .profile_settings %} - - {% endunless %} - - {% t .sign_out %} - -
-
-
- -{% include "messages" %} - - - - \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/_header.html (2).liquid b/Custom_Templates/customer_templates/Zenjob/_header.html (2).liquid deleted file mode 100644 index c99aa4de..00000000 --- a/Custom_Templates/customer_templates/Zenjob/_header.html (2).liquid +++ /dev/null @@ -1,398 +0,0 @@ -{% assign is_in_authenticated_group = false %} - -{% for group in current_person.groups %} - {% if group.name == "All Users" or group.id == "6331d115-ea74-418a-99b2-af5c81208fe1" %} - {% assign is_in_authenticated_group = true %} - {% endif %} -{% endfor %} - -{% if current_person.email contains "+preview" %} - {% assign is_in_authenticated_group = true %} -{% endif %} - -{% unless is_in_authenticated_group %} - -{% endunless %} - -
-
-
- {% if current_person.signed_in? %} - - - {% endif %} -
- {% if current_school.logo_url %} -

- - {{ current_school.name }} - -

- {% else %} - - {{ current_school.name }} - - {% endif %} - -
- -
- - {% if current_person.signed_in? %} -
-
- - -
-
-
- - -
- {% else %} -
- {% endif %} - -
- -
-
Trainings - Lernwege - Auszeichnungen - On-The-Job Videos -
- - -
-
-
-
- -{% include "messages" %} - - - - \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/_header.html.liquid b/Custom_Templates/customer_templates/Zenjob/_header.html.liquid index c99aa4de..e381cc2f 100644 --- a/Custom_Templates/customer_templates/Zenjob/_header.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_header.html.liquid @@ -4,7 +4,7 @@ {% if group.name == "All Users" or group.id == "6331d115-ea74-418a-99b2-af5c81208fe1" %} {% assign is_in_authenticated_group = true %} {% endif %} -{% endfor %} +{% endfor %} {% if current_person.email contains "+preview" %} {% assign is_in_authenticated_group = true %} @@ -69,6 +69,10 @@
  • On-The-Job Videos
    • +
  • + + Veranstaltungen +
    • {% for website_navigation in navigations.header_navigations_external %}
  • Lernwege Auszeichnungen On-The-Job Videos + Veranstaltungen
    \ No newline at end of file + diff --git a/Custom_Templates/customer_templates/Zenjob/_learning_path_course.html.liquid b/Custom_Templates/customer_templates/Zenjob/_learning_path_course.html.liquid index 0d176535..ffb014a3 100644 --- a/Custom_Templates/customer_templates/Zenjob/_learning_path_course.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_learning_path_course.html.liquid @@ -49,7 +49,17 @@ {% else %}
    {% if course.optional? %} - Heft öffnen + {% if course.name == "Servicetraining" or course.name == "Kassentraining" %} + {% if course.progress == 0 %} + Start + {% elsif course.progress > 0 and course.progress < 100 %} + Fortsetzen + {% else %} + Anzeigen + {% endif %} + {% else %} + Heft öffnen + {% endif %} {% else %} {% if course.progress == 0 %} Start @@ -89,7 +99,18 @@ {% else %}
    {% if course.optional? %} + {% if course.name == "Servicetraining" or course.name == "Kassentraining" %} + {% if course.progress == 0 %} + Start + {% elsif course.progress > 0 and course.progress < 100 %} + Fortsetzen + {% else %} + Anzeigen + {% endif %} + {% else %} Heft öffnen + {% endif %} + {% else %} {% if course.progress == 0 %} Start @@ -117,7 +138,17 @@ {% else %}
    {% if course.optional? %} - Heft öffnen + {% if course.name == "Servicetraining" or course.name == "Kassentraining" %} + {% if course.progress == 0 %} + Start + {% elsif course.progress > 0 and course.progress < 100 %} + Fortsetzen + {% else %} + Anzeigen + {% endif %} + {% else %} + Heft öffnen + {% endif %} {% else %} {% if course.progress == 0 %} Start diff --git a/Custom_Templates/customer_templates/Zenjob/_learning_path_outline.html.liquid b/Custom_Templates/customer_templates/Zenjob/_learning_path_outline.html.liquid index 21af3b0b..c880964f 100644 --- a/Custom_Templates/customer_templates/Zenjob/_learning_path_outline.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_learning_path_outline.html.liquid @@ -26,14 +26,24 @@ padding:16px; } + .np-learning-path-session-card .np-events-content-date-wrapper { + height:185px; + margin-bottom:20px; + } + .np-learning-path-session-card .np-events-content-date { min-width: auto; - width: 90px; + width: 100%; padding: 8px 16px; - height: auto; + height: 100%; margin: 0 auto 16px; } + .np-learning-path-session-card .np-events-content-month, + .np-learning-path-session-card .np-events-content-day { + font-size: 32px; + } + .np-learning-path-session-card .np-events-content-time { font-size:16px;} .np-learning-path-session-card .np-optional-ribbon { @@ -72,11 +82,22 @@ align-items: center; } - .np-learning-path-session-card .np-events-content-date { - width: 150px; - margin: 0 12px 0 0; - padding: 22px; - } + .np-learning-path-session-card .np-events-content-date-wrapper { + width: 40%; + max-width: 300px; + height: calc(100% + 32px); + margin: -16px 0; + padding: 16px; + border-right: 1px solid #e0f3ff; + position:relative; + left: -16px; + flex:1; + } + + .np-learning-path-session-card .np-events-content-date { + margin: 0 8px; + width:auto; + } .np-learning-path-session-card .np-events-content-day { font-size: 30px; @@ -85,16 +106,18 @@ .np-learning-path-session-card .np-learning-path-outline-content { flex-direction:column; + padding: 6px 16px 0 0; + height:100%; + flex: 1; } .np-learning-path-session-card .np-optional-ribbon { - left: 26%; - right: unset; - top: 16px; + right: 22px; + top: 22px; } .np-learning-path-session-card .np-learning-path-outline-name { - margin-top: 16px; + font-size: 16px; } } diff --git a/Custom_Templates/customer_templates/Zenjob/_learning_path_training_session.html.liquid b/Custom_Templates/customer_templates/Zenjob/_learning_path_training_session.html.liquid index aa1164ed..8293a963 100644 --- a/Custom_Templates/customer_templates/Zenjob/_learning_path_training_session.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_learning_path_training_session.html.liquid @@ -10,6 +10,29 @@ {% assign lp_session_required = 0 %} {% endif %} +{% assign training_session_time = training_session.time | split: " - " %} + +{% assign start_time = training_session_time | slice: 0 | join: "" %} +{% if start_time contains "PM" %} + {% assign start_time = start_time | remove: " PM" %} + {% assign split_start_time = start_time | split: ":" %} + {% assign start_time_hour = split_start_time | slice: 0 | join: "" | abs | plus: 12 %} + {% assign start_time_mins = split_start_time | slice: 1 | join: "" %} +{% elsif start_time contains "AM" %} + {% assign start_time = start_time | remove: " AM" %} +{% endif %} + +{% assign end_time = training_session_time | slice: 1 | join: "" %} +{% if end_time contains "PM" %} + {% assign end_time = end_time | remove: " PM" %} + {% assign split_end_time = end_time | split: ":" %} + {% assign end_time_hour = split_end_time | slice: 0 | join: "" | abs | plus: 12 %} + {% assign end_time_mins = split_end_time | slice: 1 | join: "" %} +{% elsif end_time contains "AM" %} + {% assign end_time = end_time | remove: " AM" %} +{% endif %} + + {% if learning_path.enrolled? and training_session.unlocked? %}
    @@ -18,53 +41,62 @@ href="{% route training_session, id: training_session.id %}" >
    -
    -
    - {{ training_session.month }} -
    -
    - {{ training_session.day }} -
    +
    +
    +
    + {{ training_session.month }} +
    +
    + {{ training_session.day }} +
    +
    + {% if training_session.optional? %} +
    + {% t shared.optional %} +
    + {% endif %}
    {{ training_session.name }}
    -
    {{ training_session.instructors }}
    +
    + {% assign instructor_name = training_session.instructors | split: " " %} + {{ instructor_name | slice: 0 }} +
    - {{ training_session.time }} {{ training_session.time_zone }} + {{start_time_hour}}:{{start_time_mins}} - {{end_time_hour}}:{{end_time_mins}} Uhr
    Registrieren
    - {% if training_session.optional? %} -
    - {% t shared.optional %} -
    - {% endif %} +
    {% else %} -
    +
    -
    -
    - {{ training_session.month }} -
    -
    - {{ training_session.day }} -
    +
    +
    +
    + {{ training_session.month }} +
    +
    + {{ training_session.day }} +
    +
    + {% if training_session.optional? %} +
    + {% t shared.optional %} +
    + {% endif %}
    {{ training_session.name }}
    {{ training_session.caption }}
    - {% if training_session.optional? %} -
    - {% t shared.optional %} -
    - {% endif %} +
    diff --git a/Custom_Templates/customer_templates/Zenjob/_training_session_details.html.liquid b/Custom_Templates/customer_templates/Zenjob/_training_session_details.html.liquid index e0166d74..ef554d64 100644 --- a/Custom_Templates/customer_templates/Zenjob/_training_session_details.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/_training_session_details.html.liquid @@ -1,3 +1,25 @@ +{% assign training_session_time = training_session.time_period | split: " - " %} + +{% assign start_time = training_session_time | slice: 0 | join: "" %} +{% if start_time contains "PM" %} + {% assign start_time = start_time | remove: " PM" %} + {% assign split_start_time = start_time | split: ":" %} + {% assign start_time_hour = split_start_time | slice: 0 | join: "" | abs | plus: 12 %} + {% assign start_time_mins = split_start_time | slice: 1 | join: "" %} +{% elsif start_time contains "AM" %} + {% assign start_time = start_time | remove: " AM" %} +{% endif %} + +{% assign end_time = training_session_time | slice: 1 | join: "" %} +{% if end_time contains "PM" %} + {% assign end_time = end_time | remove: " PM" %} + {% assign split_end_time = end_time | split: ":" %} + {% assign end_time_hour = split_end_time | slice: 0 | join: "" | abs | plus: 12 %} + {% assign end_time_mins = split_end_time | slice: 1 | join: "" %} +{% elsif end_time contains "AM" %} + {% assign end_time = end_time | remove: " AM" %} +{% endif %} +
    {% include "training_session_date", training_session: training_session %} @@ -38,7 +60,7 @@
    - {{ training_session.time_period | replace: "AM", "am" | replace: "PM", "pm" | replace: "-", "–" }} {{ training_session.time_zone }} + {{start_time_hour}}:{{start_time_mins}} - {{end_time_hour}}:{{end_time_mins}} Uhr
    {% if training_session.location %} @@ -54,7 +76,8 @@ {% if training_session.instructor and training_session.instructor.size > 0 %}
    - {{ training_session.instructor }} + {% assign instructor_name = training_session.instructor | split: " " %} + {{ instructor_name | slice: 0 }}
    {% endif %}
    \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Zenjob/course.html.liquid b/Custom_Templates/customer_templates/Zenjob/course.html.liquid index 0216e8a7..2060ac08 100644 --- a/Custom_Templates/customer_templates/Zenjob/course.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/course.html.liquid @@ -11,6 +11,14 @@ {% endif %} {% endfor %} +{% if course.properties.skip_course_cover_page == true %} + {% if course.enrolled? %} + + {% else %} + + {% endif %} +{% endif %} + {% include "header", current_page_orgin: "catalog" %}
    diff --git a/Custom_Templates/customer_templates/Zenjob/homepage.html (3).liquid b/Custom_Templates/customer_templates/Zenjob/homepage.html (3).liquid deleted file mode 100644 index d50d2e7d..00000000 --- a/Custom_Templates/customer_templates/Zenjob/homepage.html (3).liquid +++ /dev/null @@ -1,354 +0,0 @@ -{% assign isAuthenticatedUser = false %} - -{% for group in current_person.groups %} - {% if group.name == "All Users" or group.id == "6331d115-ea74-418a-99b2-af5c81208fe1" %} - {% assign isAuthenticatedUser = true %} - {% endif %} -{% endfor %} - -{% if current_person.email contains "+preview" %} - {% assign isAuthenticatedUser = true %} -{% endif %} - -{% unless isAuthenticatedUser %} -
    -
    -
    -
    - {{ homepage.headline }} -
    -
    - Entschuldigung! Es scheint, dass deine E-Mail-Adresse ({{current_person.email}}) nicht den richtigen Zugang erhalten hat. Bitte wende dich an talents@zenjob.com, um den Zugang zu den vollständigen Lerninhalten anzufragen. -
    -
    -
    -
    -{% endunless %} - -{% if isAuthenticatedUser %} - {% assign catalog_courses = courses.in_catalog %} - {% include "header", current_page_orgin: "false" %} - -
    -
    -
    -
    - {{ homepage.headline }} -
    -
    - Hallo {{ current_person.first_name }}, hier bereiten wir dich auf alles vor, was du für deine erste Schicht als -
    - -
    - Kassierer*in - Kellner*in - Warenverräumer*in - {% comment %} Logistikhelfer*in {% endcomment %} -
    -
    - wissen musst. -     -
    -
    - -
    - {% for course in catalog_courses %} - {% if course.properties.homepage_course %} - {% for cat in course.categories %} - {% if cat.id == "087ea56d-888b-4e0f-af1f-68627318c841" or cat.id == "9be55234-19c5-4df4-bd1d-03e93f0faf83" or cat.id == "6580e10e-eacf-402d-a330-51d202721cce" or cat.id == "a63019c7-0a46-40bd-bc1b-935c887a4380" %} - - {% endif %} - {% endfor %} - {% endif %} - {% endfor %} - - {% for learning_path in learning_paths.available %} - {% for learning_path_cat in learning_path.categories %} - {% if learning_path_cat.id == "087ea56d-888b-4e0f-af1f-68627318c841" or learning_path_cat.id == "9be55234-19c5-4df4-bd1d-03e93f0faf83" or learning_path_cat.id == "6580e10e-eacf-402d-a330-51d202721cce" or learning_path_cat.id == "a63019c7-0a46-40bd-bc1b-935c887a4380" %} - - {% endif %} - {% endfor %} - {% endfor %} -
    -
    -
    - - {% include "footer" %} - {% endif %} - - - - diff --git a/Custom_Templates/customer_templates/Zenjob/learning_path.html.liquid b/Custom_Templates/customer_templates/Zenjob/learning_path.html.liquid index 5c92e795..f4bae39c 100644 --- a/Custom_Templates/customer_templates/Zenjob/learning_path.html.liquid +++ b/Custom_Templates/customer_templates/Zenjob/learning_path.html.liquid @@ -144,7 +144,8 @@ } @media (min-width:1400px) { - .np-learning-path-outline-item .np-card-content-title { + .np-learning-path-outline-item .np-card-content-title, + .np-learning-path-session-card .np-learning-path-outline-name { font-size:18px; } diff --git a/Scripts/API_Tests/get_courses.py b/Scripts/API_Tests/get_courses.py index 609f5816..f48686a6 100644 --- a/Scripts/API_Tests/get_courses.py +++ b/Scripts/API_Tests/get_courses.py @@ -23,18 +23,20 @@ def get_course(): status = response["attributes"]["status"] uuid = response["id"] name = response["attributes"]["name"] + build_url = response["links"]["builder"]["href"] course_dict = { "id": uuid, "name": name, "status": status, - "url": f"https://walmart.northpass.com/app/courses/{uuid}", + "build_url": build_url + # "url": f"https://walmart.northpass.com/app/courses/{uuid}", } # FIX: Up until here, each course gets read to the terminal. # FIX: After this, something is being overwritten. cat_id = response["relationships"]["categories"]["data"] - # get_cat_name(cat_id, course_dict, courses) + get_cat_name(cat_id, course_dict, courses) if "next" not in nextlink: break diff --git a/Scripts/Backup_Notes_Scripts/confluence_get.py b/Scripts/Backup_Notes_Scripts/confluence_get.py index e8cfd458..cf752330 100644 --- a/Scripts/Backup_Notes_Scripts/confluence_get.py +++ b/Scripts/Backup_Notes_Scripts/confluence_get.py @@ -3,78 +3,77 @@ from requests.auth import HTTPBasicAuth import json import os -# Information -#url = "https://northpass.atlassian.net/wiki/rest/api/content/2210463745/child/page" +# Information +# url = "https://northpass.atlassian.net/wiki/rest/api/content/2210463745/child/page" url = "https://northpass.atlassian.net/wiki/rest/api/content/" -auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") +auth = HTTPBasicAuth("nrasmussen@northpass.com","ATATT3xFfGF0QZUomC1s3hvD4Hiqh_usOVFAVLsT1n8lt6gzD7wfL8D8x5ner3SE24JD4E590xoT9PKPIi1Eppanx12q5ALzMHKce-KrcIZRT23BvO8MDXwyvbzAO2R4hALc8ZUTI_8-OM-x9o_tjbCHLxEMFOr6QFDYprwdHGZjAxpviSwXrCQ=218AC438") + +rootdir = "/Users/normrasmussen/Documents/Work/CustomerNotes/" -rootdir = "/Users/normrasmussen/Documents/Northpass/CustomerNotes/" def getCompany(): - rootdir = "/Users/normrasmussen/Documents/Northpass/Scripts/Confluence_Notes/SampleNotes/" + rootdir = ( + "/Users/normrasmussen/Documents/Work/CustomerNotes/" + ) companyName = os.listdir(rootdir) for fileName in companyName: company = fileName[:-3] getPages(company) + def readNewNotes(company): - rootdir = "/Users/normrasmussen/Documents/Northpass/Scripts/Confluence_Notes/SampleNotes/" - with open(rootdir+company+".md", "r") as companyfile: + rootdir = ( + "/Users/normrasmussen/Documents/Work/CustomerNotes/" + ) + with open(rootdir + company + ".md", "r") as companyfile: notes = companyfile.read() conversion = markdown.markdown(notes) createNewPage(company, conversion) + def getPages(company): headers = { "Accept": "application/json", } - response = requests.request( - "GET", - url, - headers=headers, - auth=auth - ) + response = requests.request("GET", url, headers=headers, auth=auth) jsonResponse = response.json() - for response in jsonResponse['results']: - if response['title'] == company: + for response in jsonResponse["results"]: + if response["title"] == company: print(f"{company} Found. Updating page....") else: print(f"{company} not found. Create new page...") - readNewNotes(company) + # readNewNotes(company) -def createNewPage(company, notes): + +def createNewPage(company, notes): url = "https://northpass.atlassian.net/wiki/rest/api/content/" auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") headers = { "X-Atlassian-Token": "no-check", "Accept": "application/json", - "Content-Type": "application/json" + "Content-Type": "application/json", } - payload = json.dumps( { - "type":"page", - "title": company, - "ancestors":[{"id":2210463745}], - "space": - {"key":"~350535240"}, - "body": - {"storage": - {"value": notes, - "representation":"storage"}} - } ) - - response = requests.request( - "POST", - url, - data=payload, - headers=headers, - auth=auth + payload = json.dumps( + { + "type": "page", + "title": company, + "ancestors": [{"id": 2210463745}], + "space": {"key": "~350535240"}, + "body": {"storage": {"value": notes, "representation": "storage"}}, + } ) + + response = requests.request("POST", url, data=payload, headers=headers, auth=auth) print("createNewPage function has run") - response = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ")) + response = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) print(response) - #jsonResponse = response.json() - #print(jsonResponse) + # jsonResponse = response.json() + # print(jsonResponse) + if __name__ == "__main__": - createNewPage() - #readNewNotes(company="Flink") + getCompany() + # createNewPage() + # readNewNotes(company="Flink") diff --git a/Scripts/GoogleScripts/Confluence_Test/.clasp.json b/Scripts/GoogleScripts/Confluence_Test/.clasp.json new file mode 100644 index 00000000..5abc1b33 --- /dev/null +++ b/Scripts/GoogleScripts/Confluence_Test/.clasp.json @@ -0,0 +1 @@ +{"scriptId":"1ZUQXaSRZHjVpzJBBFuHdfnLijMJ5jf3swTbonwXJ3nrgeMIh9ffCqe7j","rootDir":"/Users/normrasmussen/Documents/Work/Scripts/GoogleScripts/Confluence_Test"} diff --git a/Scripts/GoogleScripts/Confluence_Test/ConfGet.js b/Scripts/GoogleScripts/Confluence_Test/ConfGet.js new file mode 100644 index 00000000..176a191b --- /dev/null +++ b/Scripts/GoogleScripts/Confluence_Test/ConfGet.js @@ -0,0 +1,18 @@ +function getPages() { + var url = 'https://northpass.atlassian.net/wiki/rest/api/content'; + const settings = { + //async: true, + //crossDomain: true, + method: 'get', + headers: { + "Accept": "application/json", + "X-Atlassian-Token": "no-check", + "Content-Type": "application/json", + "Authorization": "Basic bnJhc211c3NlbkBub3J0aHBhc3MuY29tOkFUQVRUM3hGZkdGMFFaVW9tQzFzM2h2RDRIaXFoX3VzT1ZGQVZMc1QxbjhsdDZnekQ3d2ZMOEQ4eDVuZXIzU0UyNEpENEU1OTB4b1Q5UEtQSWkxRXBwYW54MTJxNUFMek1IS2NlLUtyY0laUlQyM0J2TzhNRFh3eXZiekFPMlI0aEFMYzhaVVRJXzgtT00teDlvX3RqYkNITHhFTUZPcjZRRkRZcHJ3ZEhHWmpBeHB2aVN3WHJDUT0yMThBQzQzOA==" + }, + }; + + const sendData = UrlFetchApp.fetch(url, settings); + var response = sendData.getContentText(); + Logger.log(response); +} \ No newline at end of file diff --git a/Scripts/GoogleScripts/Confluence_Test/appsscript.json b/Scripts/GoogleScripts/Confluence_Test/appsscript.json new file mode 100644 index 00000000..3cf1d247 --- /dev/null +++ b/Scripts/GoogleScripts/Confluence_Test/appsscript.json @@ -0,0 +1,7 @@ +{ + "timeZone": "America/New_York", + "dependencies": { + }, + "exceptionLogging": "STACKDRIVER", + "runtimeVersion": "V8" +} \ No newline at end of file diff --git a/Scripts/GoogleScripts/Courtney_Confluence/.clasp.json b/Scripts/GoogleScripts/Courtney_Confluence/.clasp.json new file mode 100644 index 00000000..b743c780 --- /dev/null +++ b/Scripts/GoogleScripts/Courtney_Confluence/.clasp.json @@ -0,0 +1 @@ +{"scriptId":"1TM7cFM57LKm9BoB21N9sCD7j_KDy9z1zrqGDXV8clcwXVwgOKJBpz_0J","rootDir":"/Users/normrasmussen/Documents/Work/Scripts/GoogleScripts/Courtney_Confluence"} diff --git a/Scripts/GoogleScripts/Courtney_Confluence/Adv.js b/Scripts/GoogleScripts/Courtney_Confluence/Adv.js new file mode 100644 index 00000000..27c12819 --- /dev/null +++ b/Scripts/GoogleScripts/Courtney_Confluence/Adv.js @@ -0,0 +1,40 @@ +/** + * Test harness to demonstrate getting named styles from the Advanced Docs Service + */ +function getStylesTestHarness() { + // Get the current document + var doc = DocumentApp.getActiveDocument() + + // https://developers.google.com/apps-script/reference/document/paragraph-heading + var namedStyleType = DocumentApp.ParagraphHeading.HEADING2; + getStyles_(doc.getId(), namedStyleType); +} + +/** + * Get named styles from the Advanced Docs Service + * Assumes that heading text is unique, which it should be with date stamp + * @param {string} documentId + * @param {string} styleType https://developers.google.com/apps-script/reference/document/paragraph-heading + * @private + */ +function getStyles_(documentId, styleType) { + + var namedStyleArr; + var namedStyleObj; + var appsScriptNamedStyle; + + // Get the corresponding document from the Advanced Docs Service + var document = Docs.Documents.get(documentId); + var namedStyleArr = document.namedStyles.styles; + + for (var i=namedStyleArr.length;i--;) { + namedStyleObj = namedStyleArr[i]; + // convert from Advanced Docs Service style names which have separating underscores + appsScriptNamedStyle = namedStyleObj.namedStyleType.split('_').join(''); + if (appsScriptNamedStyle == styleType) { + console.log('namedStyleType '+namedStyleObj.namedStyleType); + console.log('textStyle '+JSON.stringify(namedStyleObj.textStyle)); + console.log('paragraphStyle '+JSON.stringify(namedStyleObj.paragraphStyle)); + } + } +} \ No newline at end of file diff --git a/Scripts/GoogleScripts/Courtney_Confluence/Confluence.js b/Scripts/GoogleScripts/Courtney_Confluence/Confluence.js new file mode 100644 index 00000000..f4081c35 --- /dev/null +++ b/Scripts/GoogleScripts/Courtney_Confluence/Confluence.js @@ -0,0 +1,29 @@ +function uploadToConfluence() { + var doc = DocumentApp.getActiveDocument(); + var body = doc.getText(); + var company = doc.getName(); + //Logger.log(typeof body); + //Logger.log(typeof company) + + var url = 'https://northpass.atlassian.net/wiki/rest/api/content'; + const payload = JSON.stringify({ + "type": "page", + "title": company, + "status": "current", + "ancestors": [{"id": 2210463745}], + "space": {"key": "~350535240"}, + "body": {"storage": {"value": body, "representation": "storage"}}, + }); + const settings = { + method: 'post', + headers: { + "Accept": "application/json", + "X-Atlassian-Token": "no-check", + "Content-Type": "application/json", + "Authorization": "Basic bnJhc211c3NlbkBub3J0aHBhc3MuY29tOkFUQVRUM3hGZkdGMFFaVW9tQzFzM2h2RDRIaXFoX3VzT1ZGQVZMc1QxbjhsdDZnekQ3d2ZMOEQ4eDVuZXIzU0UyNEpENEU1OTB4b1Q5UEtQSWkxRXBwYW54MTJxNUFMek1IS2NlLUtyY0laUlQyM0J2TzhNRFh3eXZiekFPMlI0aEFMYzhaVVRJXzgtT00teDlvX3RqYkNITHhFTUZPcjZRRkRZcHJ3ZEhHWmpBeHB2aVN3WHJDUT0yMThBQzQzOA=="}, + payload: payload + }; + const sendData = UrlFetchApp.fetch(url, settings); + var response = sendData.getContentText(); + Logger.log(response); +} \ No newline at end of file diff --git a/Scripts/GoogleScripts/Courtney_Confluence/appsscript.json b/Scripts/GoogleScripts/Courtney_Confluence/appsscript.json new file mode 100644 index 00000000..3cf1d247 --- /dev/null +++ b/Scripts/GoogleScripts/Courtney_Confluence/appsscript.json @@ -0,0 +1,7 @@ +{ + "timeZone": "America/New_York", + "dependencies": { + }, + "exceptionLogging": "STACKDRIVER", + "runtimeVersion": "V8" +} \ No newline at end of file diff --git a/Scripts/credlib.py b/Scripts/credlib.py deleted file mode 100644 index 9a5af48b..00000000 --- a/Scripts/credlib.py +++ /dev/null @@ -1,6 +0,0 @@ -class credential: - def __init__(self, hostname, username, password, apikey): - self.hostname = hostname - self.username = username - self.password = password - self.apikey = apikey diff --git a/Scripts/csvTest.js b/Scripts/csvTest.js new file mode 100644 index 00000000..161fef6f --- /dev/null +++ b/Scripts/csvTest.js @@ -0,0 +1,87 @@ +const fs = require("fs"); +const { parse } = require("csv-parse"); +const axios = require('axios'); +var array = []; +const apiKey = 'RfmxChNLLodO6M0Z88BwG9Xyu' + +function wait(ms) { + return new Promise(r => setTimeout(r, ms)); +} + +function getUserProps(xApiKey, person) { + + axios({ + method: 'get', + url: 'https://api.northpass.com/v2/properties/people/' + person, + headers: { + 'accept': 'application/json', + 'x-api-key': xApiKey, + 'content-type': 'application/json' + } + }) + .then(res => { + info = '"' + res.data.data.attributes.properties.account_name + '"' + ';' + '"' + res.data.data.attributes.properties.company + '"' + '\n' + fs.appendFile('harriUserProps.csv', info, function(err) { + if (err) throw err; + console.log('Saved!'); + return 'saved' + }); + }) + .catch(err => { + console.log(err); + }); +}; + +function fetchPeople(xApiKey, users, num) { + let index = num; + axios({ + method: 'get', + url: 'https://api.northpass.com/v2/people?filter[' + users[index][0] + ']=' + encodeURIComponent(users[index][1]), + headers: { + 'accept': 'application/json', + 'x-api-key': xApiKey, + } + }) + .then(res => { + if (index < users.length - 1) { + console.log(index) + console.log(users[index][0], users[index][1], res.data.data[0].id) + getUserProps(xApiKey, res.data.data[0].id) + index++; + wait(300) + fetchPeople(xApiKey, users, index) + wait(300) + } else { + getUserProps(xApiKey, res.data.data[0].id) + console.log("complete") + + } + }) + .catch(err => { + console.log(err); + }); +}; + +function csvReader(someArray, filePath) { + fs.createReadStream(filePath) + .pipe(parse({ + delimiter: ',', + columns: true + })) + .on("data", function(row) { + if (row['Email'] == '') { + someArray.push(['sso_uid', row['SSO UID']]) + } else { + someArray.push(['email', row['Email']]) + } + }) + .on("error", function(error) { + console.log(error.message); + }) + .on("end", async function() { + console.log("finished"); + fetchPeople(apiKey, someArray, 0) + }) +} + +csvReader(array, "Untitled spreadsheet - harri-academy-people.csv") \ No newline at end of file diff --git a/Scripts/drac_test.py b/Scripts/drac_test.py deleted file mode 100644 index eda1936c..00000000 --- a/Scripts/drac_test.py +++ /dev/null @@ -1,65 +0,0 @@ -import adbase -import json -import time -import requests - - -class birdnet(adbase.ADBase): - def initialize(self): - self.hassapi = self.get_plugin_api("HASS") - self.adapi = self.get_ad_api() - self.mqttapi = self.get_plugin_api("MQTT") - self.birdnet_mqtt = "birdnet" - self.mqttapi.listen_event( - self.birdnet_message, "MQTT_MESSAGE", topic=self.birdnet_mqtt - ) - - def birdnet_message(self, event_name, data, kwargs): - pre_split = data["payload"] - - common_name = pre_split.split(",")[0].strip() - science_name = pre_split.split(",")[1].strip() - date_seen = pre_split.split(",")[2].strip - time_seen = pre_split.split(",")[3].strip() - confidence = pre_split.split(",")[5].strip() - - # print(f"A {common_name} was seen on {date_seen} at {time_seen}. Confidence is {confidence}.") - - self.mqttapi.mqtt_publish("birdnet/sensors/common_name", common_name) - self.mqttapi.mqtt_publish("birdnet/sensors/science_name", science_name) - self.mqttapi.mqtt_publish("birdnet/sensors/time_seen", time_seen) - self.mqttapi.mqtt_publish("birdnet/sensors/date_seen", date_seen) - self.mqttapi.mqtt_publish("birdnet/sensors/confidence", confidence) - - url = f"https://en.wikipedia.org/w/api.php?format=json&action=query&prop=extracts&exintro&explaintext&redirects=1&titles={science_name}" - response = requests.get(url) - response = response.json() - - for value in response["query"]["pages"]: - wiki_desc = response["query"]["pages"][value]["extract"] - self.hassapi.set_state( - "sensor.birdnet_wiki", state="on", attributes={"description": wiki_desc} - ) - - headers = {"User-Agent": "Python_Flickr/1.0"} - flickr_api = "2b550e7db4a944843a46e57c263582e3" - flickr_url = f"https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key={flickr_api}&text={common_name} bird&sort=relevance&per_page=5&media=photos&format=json&nojsoncallback=1" - flickr_resp = requests.get(url=flickr_url, headers=headers) - data = flickr_resp.json()["photos"]["photo"][0] - print(data) - - image_url = ( - "https://farm" - + str(data["farm"]) - + ".static.flickr.com/" - + str(data["server"]) - + "/" - + str(data["id"]) - + "_" - + str(data["secret"]) - + "_n.jpg" - ) - - self.hassapi.set_state( - "sensor.birdpic_test", state="on", attributes={"image": image_url} - ) diff --git a/Scripts/hubspotTicketSetup.js b/Scripts/hubspotTicketSetup.js new file mode 100644 index 00000000..8d3cdb0a --- /dev/null +++ b/Scripts/hubspotTicketSetup.js @@ -0,0 +1,165 @@ +const fetch = require("node-fetch"); +const api_key = "Bearer pat-na1-446d4baf-0d69-49ff-91ed-2419c1ef76ba"; + + +let ticketBaseURL = 'https://api.hubapi.com/crm/v3/objects/tickets/'; +let ticketURLParams = '?associations=company,contact,conversations&properties=estimated_hours,impact_scope,ticket_priority,school_url,sandbox_url,issue_type,product_area,specific_product_area,hubspot_owner_id,subject,content,package_level,description' +let contactBaseURL = 'https://api.hubapi.com/crm/v3/objects/contacts/'; +let reporterBaseURL = 'https://api.hubapi.com/crm/v3/owners/'; +let contactURLParams = '?associations=company&properties=company,email,firstname,lastname'; +let ticketID = ; +let ticket = { + "fields": { + "project": { + "key": "SET" + } + } +}; +let options = { + method: "GET", + headers: { + Authorization: api_key, + } +}; + + +function wait(ms) { + return new Promise(r => setTimeout(r, ms)); +} + +async function getTicketInfo(ticketID) { + const ticketResp = await fetch(ticketBaseURL + ticketID + ticketURLParams, options); + const ticketData = await ticketResp.json(); + const reporterResp = await fetch(reporterBaseURL + ticketData.properties.hubspot_owner_id, options); + const reporterData = await reporterResp.json(); + const contactResp = await fetch(contactBaseURL + ticketData.associations.contacts.results[0].id + contactURLParams, options); + const contactData = await contactResp.json(); + const jiraResp = await fetch('https://northpass.atlassian.net/rest/api/3/user/search?query=' + reporterData.email, { + method: 'GET', + headers: { + 'Authorization': `Basic Y2JlbmNpdmVuZ2FAbm9ydGhwYXNzLmNvbTpRcm1nSjVDbG00dUdvQXVWTnp5OTlFMzM=`, + 'Accept': 'application/json', + }, + + }); + const jiraData = await jiraResp.json(); + + try { + if (ticketData) { + console.log(ticketData) + console.log(ticketData.associations.companies.results); + console.log(contactData) + console.log(reporterData) + if (ticketData.properties.hasOwnProperty('issue_type')) { + ticket.fields.issuetype = { "name": ticketData.properties.issue_type }; + } + if (ticketData.properties.hasOwnProperty('impact_scope') && ticketData.properties.issue_type == 'Bug') { + ticket.fields.customfield_10170 = { "value": ticketData.properties.impact_scope } + } + + if (ticketData.properties.hasOwnProperty('ticket_priority')) { + ticket.fields.priority = { "name": ticketData.properties.ticket_priority } + } + if (ticketData.properties.hasOwnProperty('school_url')) { + if (ticketData.properties.school_url.indexOf("https") == 0) { + ticket.fields.customfield_10171 = ticketData.properties.school_url + } else { + ticket.fields.customfield_10171 = "https://" + ticketData.properties.school_url + } + } + if (ticketData.properties.hasOwnProperty('sandbox_url') && ticketData.properties.issue_type == 'Change') { + if (ticketData.properties.school_url.indexOf("https") == 0) { + ticket.fields.customfield_10172 = ticketData.properties.sandbox_url + } else { + ticket.fields.customfield_10172 = "https://" + ticketData.properties.sandbox_url + } + } + if (ticketData.properties.hasOwnProperty('product_area') && (ticketData.properties.issue_type !== 'Information' && ticketData.properties.issue_type !== 'Demo')) { + ticket.fields.customfield_10168 = { "value": ticketData.properties.product_area } + } + if (ticketData.properties.hasOwnProperty('estimated_hours')) { + if (ticketData.properties.estimated_hours) { + ticket.fields.timetracking = { + "originalEstimate": ticketData.properties.estimated_hours + 'h', + "remainingEstimate": ticketData.properties.estimated_hours + 'h' + } + } + } + if (ticketData.properties.hasOwnProperty('specific_product_area') && (ticketData.properties.issue_type !== 'Information' && ticketData.properties.issue_type !== 'Demo')) { + ticket.fields.customfield_10169 = { "value": ticketData.properties.specific_product_area } + } + if (ticketData.properties.hasOwnProperty('subject')) { + ticket.fields.summary = ticketData.properties.subject + } + if (ticketData.properties.hasOwnProperty('content') && ticketData.properties.content !== null) { + ticket.fields.description = { + "version": 1, + "type": "doc", + "content": [{ + "type": "paragraph", + "content": [{ + "type": "text", + "text": ticketData.properties.content + }] + }] + } + } + if (ticketData.properties.hasOwnProperty('package_level')) { + ticket.fields.customfield_10156 = { "value": ticketData.properties.package_level } + } + if (ticketData.associations.companies.results[0].hasOwnProperty('id')) { + ticket.fields.customfield_10173 = ticketData.associations.companies.results[0].id + } + if (ticketData.properties.hasOwnProperty('due_date') && ticketData.properties.issue_type == 'Demo') { + ticket.fields.duedate = ticketData.properties.due_date + } + if (ticketData.associations.hasOwnProperty('conversations')) { + if (ticketData.associations.conversations.results[0].hasOwnProperty('id')) { + ticket.fields.customfield_10176 = ticketData.associations.conversations.results[0].id + } + } + if (ticketID) { + ticket.fields.customfield_10174 = ticketID.toString() + } + if (contactData.properties.hasOwnProperty('company')) { + ticket.fields.customfield_10028 = [contactData.properties.company.replace(/\s/g, '')] + } + // No reason to use this yet. Will think about about keeping it or removing + // if (contactData.properties.hasOwnProperty('email')) { + // ticket.fields.customerEmail = contactData.properties.email + // } + if (jiraData[0].hasOwnProperty('accountId')) { + ticket.fields.reporter = { "accountId": jiraData[0].accountId } + } + + console.log(ticket) + + let bodyData = JSON.stringify(ticket) + + fetch('https://northpass.atlassian.net/rest/api/3/issue', { + method: 'POST', + headers: { + 'Authorization': `Basic Y2JlbmNpdmVuZ2FAbm9ydGhwYXNzLmNvbTpRcm1nSjVDbG00dUdvQXVWTnp5OTlFMzM=`, + 'Accept': 'application/json', + 'Content-Type': 'application/json' + }, + body: bodyData + }) + .then(response => { + console.log( + `Response: ${response.status} ${response.statusText}` + ); + return response.text(); + }) + .then(text => console.log(text)) + .catch(err => console.error(err)); + return ticket + } else { + console.log("complete"); + } + } catch (err) { + console.log(err); + }; +}; + +getTicketInfo(ticketID); \ No newline at end of file