diff --git a/CustomerNotes/Nana.md b/CustomerNotes/Nana.md index 3cb53546..4fbecbcd 100644 --- a/CustomerNotes/Nana.md +++ b/CustomerNotes/Nana.md @@ -10,4 +10,4 @@ * If he sets up a group with 4 courses, can Fountain provision the group? * Copy over styling from Nana to Nana Fountain * Change Font too. Make sure everything matches -* + diff --git a/NP_Custom_Templates/customer_templates/JnJVision/.DS_Store b/NP_Custom_Templates/customer_templates/JJSV/.DS_Store similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/.DS_Store rename to NP_Custom_Templates/customer_templates/JJSV/.DS_Store diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_catalog.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_cards_catalog.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_cards_catalog.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_cards_catalog.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_cards_course.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_cards_course.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_cards_course.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_learning_path.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_cards_learning_path.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_cards_learning_path.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_cards_learning_path.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_cards_training_event.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_cards_training_event.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_cards_training_event.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JJSV/_catalog_zero_state.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_catalog_zero_state.html.liquid new file mode 100644 index 00000000..22881c36 --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JJSV/_catalog_zero_state.html.liquid @@ -0,0 +1,11 @@ +
+
+ There are currently no topics available +
+
+ + \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_category_filter_sidebar.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_category_filter_sidebar.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_category_filter_sidebar.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_category_filter_sidebar.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_activity_locked.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_activity_locked.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_activity_locked.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_activity_locked.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_activity_unlocked.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_activity_unlocked.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_activity_unlocked.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_activity_unlocked.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_banner.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_banner.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_banner.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_banner.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_description.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_description.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_description.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_description.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_desktop_view.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_desktop_view.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_desktop_view.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_desktop_view.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_details_review.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_details_review.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_details_review.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_details_review.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_mobile_view.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_mobile_view.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_mobile_view.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_mobile_view.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_outline.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_outline.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_outline.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_outline.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_course_progress_and_cta.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_course_progress_and_cta.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_course_progress_and_cta.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_courses_catalog.html.liquid similarity index 57% rename from NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_courses_catalog.html.liquid index 9d688b61..b43f109c 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_courses_catalog.html.liquid +++ b/NP_Custom_Templates/customer_templates/JJSV/_courses_catalog.html.liquid @@ -7,10 +7,5 @@ {% endfor %} {% else %} - {% capture message %} - {% t shared.zero_state.courses.catalog, - key: current_school.course_vocabulary - %} -{% endcapture %} -{% include "courses_zero_state", message: message %} + {% include "catalog_zero_state" %} {% endif %} diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_courses_zero_state.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_courses_zero_state.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_courses_zero_state.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_courses_zero_state.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JJSV/_footer.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_footer.html.liquid new file mode 100644 index 00000000..8324b96f --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JJSV/_footer.html.liquid @@ -0,0 +1,246 @@ +
+
+

Please see our Privacy Policy. Use of this site constitutes your consent to the application of such laws and regulations and to our Privacy Policy. Your use of the information on this site is subject to the terms of our Terms of Use. + {% comment %} Contact Us with any questions or search this site for more information.

{% endcomment %} + +

This website is published by Johnson & Johnson Services, Inc., which is solely responsible for its content. This website is intended for visitors in the United States. Third-party trademarks used herein are trademarks of their respective owners. Portions of this website are intended for visitors from certain geographical regions only and will be indicated as such.

+ +

The materials on this website are intended to provide information about products of the Johnson & Johnson Medical Devices Companies. Each product has its own labeling, which may include specific limitations relevant to the use of the product and which may vary from country to country. Please remember to check the local labeling of each product you plan to use to be aware of these limitations. If you have any questions on the use of these products, please contact your sales consultant.

+ +

This is a Healthcare Professional (HCP) educational website published by the Johnson & Johnson Institute, LLC which is solely responsible for its content. It is intended for all HCPs. Third party trademarks used herein are trademarks of their respective owners. You are solely responsible for your interactions on this website and we encourage you to review the Privacy Policy. HCPs are advised to consult their respective regulatory bodies, licensing authorities and program directors for program and product specific information and applicable industry associations and laws related to interactions between suppliers and HCPs. HCPs are responsible for complying with any specific hospital/entity requirements as well as their respective legal and regulatory requirements - which may affect participation in the programs offered. Products and/or procedures referenced in program materials may not be approved for sale in your location or the approval may differ from what is presented. Please check your local product labeling/instructions for use for the approved use. Program materials are not intended to be relied upon for medical or other advice.

+ + {% comment %}

093430-180612

{% endcomment %} +
+ +
+
+
About
+
+
+ About Us + News & Media + Grants + State & Federal Advocacy + Transparency +
+
+
+
Useful Links
+
+
+ Johnson & Johnson Institute + Johnson & Johnson Vision Pro + Direct Ordering + Discontinued Products +
+
+
+
Legal
+
+
+ Privacy Policy + California Compliance + Important Safety Information + Legal Policy +
+
+
+
Connect With Us
+
+
+ + Contact Us +
+
+
pp2022xxxx
+
+ + + + \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_head.html.liquid similarity index 100% rename from NP_Custom_Templates/customer_templates/JnJVision/_head.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_head.html.liquid diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_header.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_header.html.liquid similarity index 72% rename from NP_Custom_Templates/customer_templates/JnJVision/_header.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_header.html.liquid index ca41ff34..c5c68cf3 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_header.html.liquid +++ b/NP_Custom_Templates/customer_templates/JJSV/_header.html.liquid @@ -25,11 +25,7 @@ class="np-header-mobile-menu-nav-button np-header-mobile-avatar-menu" data-toggle-target=".fa-times, .np-header-mobile-menu-content, .np-main, .np-footer" > - {{ current_person.name }} + {% endif %} @@ -62,7 +58,7 @@ {% if link.label == 'Dashboard' %} My Topics {% elsif link.label == 'Catalog' %} - All Topics + All Content {% else %} {{ link.label }} {% endif %} @@ -71,6 +67,14 @@ {% endunless %} {% endfor %} +
  • + + Product Education + +
    • {% endif %} {% for website_navigation in navigations.header_navigations_external %}
  • @@ -181,14 +185,34 @@ {% for website_navigation in navigations.header_navigations %} - - {{ website_navigation.name }} - + {% unless website_navigation.path == '/app/learning_paths' %} + + {% if website_navigation.name == 'Dashboard' %} + My Topics + {% elsif website_navigation.name == 'Catalog' %} + All Topics + {% else %} + {{ website_navigation.name }} + {% endif %} + + {% endunless %} {% endfor %} + + All Content + + + Product Education +
    {% unless current_school.sso_active? %} {% endunless %} {% t .sign_out %} @@ -209,3 +233,68 @@ {% include "messages" %} + + + + diff --git a/NP_Custom_Templates/customer_templates/JJSV/_homepage_hero_carousel.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_homepage_hero_carousel.html.liquid new file mode 100644 index 00000000..787bfbf7 --- /dev/null +++ b/NP_Custom_Templates/customer_templates/JJSV/_homepage_hero_carousel.html.liquid @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_login_registration.html.liquid b/NP_Custom_Templates/customer_templates/JJSV/_homepage_login_registration.html.liquid similarity index 86% rename from NP_Custom_Templates/customer_templates/JnJVision/_homepage_login_registration.html.liquid rename to NP_Custom_Templates/customer_templates/JJSV/_homepage_login_registration.html.liquid index 3845a04a..8a75b739 100644 --- a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_login_registration.html.liquid +++ b/NP_Custom_Templates/customer_templates/JJSV/_homepage_login_registration.html.liquid @@ -1,4 +1,4 @@ -
    + @@ -33,15 +28,15 @@ \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_category_cards.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_homepage_category_cards.html.liquid deleted file mode 100644 index 7e69bbe8..00000000 --- a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_category_cards.html.liquid +++ /dev/null @@ -1,70 +0,0 @@ -
    - {% comment %}
    - -
    - Podcasts -
    -
    -

    Professional Events

    -
    -
    -     -
    - -
    - -
    - Product -
    -
    -

    Johnson & Johnson Product Education

    -
    -
    -     -
    {% endcomment %} - -
    - -
    - Product -
    -
    -

    Fine-Tuned Podcast Series

    -
    -
    -     -
    - -
    - -
    - Product -
    -
    -

    Challenging Cases Video Series

    -
    -
    -     -
    -
    - - - \ No newline at end of file diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_hero_carousel.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_homepage_hero_carousel.html.liquid deleted file mode 100644 index ed8b46a4..00000000 --- a/NP_Custom_Templates/customer_templates/JnJVision/_homepage_hero_carousel.html.liquid +++ /dev/null @@ -1,201 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Scripts/WalmartExcel/walmart.py b/Scripts/WalmartExcel/walmart.py index eeca172f..30e468e9 100644 --- a/Scripts/WalmartExcel/walmart.py +++ b/Scripts/WalmartExcel/walmart.py @@ -8,7 +8,7 @@ import pandas as pd rootdir = "/Users/normrasmussen/Documents/Resources/Walmart/" downloadir = "/Users/normrasmussen/Google Drive/My Drive/Shared with Clients/Walmart/" -basefile = "WalmartBase.xlsx" +basefile = "WalmartTemplate.xlsx" def copytemplate(rootdir, basefile): today = date.today() @@ -24,13 +24,19 @@ def copytemplate(rootdir, basefile): findlatestExport(currentDash) def findlatestExport(currentDash): - listfiles = glob.glob(downloadir + '*.xlsx') + listfiles = glob.glob(downloadir + '*.csv') latestdownload = max(listfiles, key=os.path.getctime) print(latestdownload) copytoDash(latestdownload, currentDash) def copytoDash(latestdownload, currentDash): - readExport = pd.read_excel(latestdownload, index_col=False) + readExport = pd.read_csv( + latestdownload, + index_col=False, + header=0, + dtype={ + 'Progress':int + }) print(readExport) readExport.drop( readExport.filter( @@ -50,6 +56,7 @@ def bringtoExcel(latestdownload, currentDash, copiedData): ) as writer: copiedData.to_excel( writer, + engine="xlsxwriter", sheet_name="Data", index=False, ) diff --git a/Timetagger/_timetagger/users/norm~bm9ybQ==.db b/Timetagger/_timetagger/users/norm~bm9ybQ==.db index af3650a8..1510a946 100644 Binary files a/Timetagger/_timetagger/users/norm~bm9ybQ==.db and b/Timetagger/_timetagger/users/norm~bm9ybQ==.db differ