calendar icon indicating copy to clipboard operation
calendar copied to clipboard

Feature/exercise

Open orontamir opened this issue 5 years ago • 32 comments

Create new freature

in feature page , cliking on "Start Exercise" and in "Exercixe" tab you can see exercise plane each day for 30 days

orontamir avatar Feb 07 '21 13:02 orontamir

Codecov Report

Merging #227 (ec126c3) into develop (5c2136b) will decrease coverage by 0.57%. The diff coverage is 60.27%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #227      +/-   ##
===========================================
- Coverage    94.43%   93.85%   -0.58%     
===========================================
  Files           91       93       +2     
  Lines         4257     4329      +72     
===========================================
+ Hits          4020     4063      +43     
- Misses         237      266      +29     
Impacted Files Coverage Δ
app/main.py 96.00% <ø> (ø)
app/routers/profile.py 85.60% <35.29%> (-7.44%) :arrow_down:
app/routers/exercise.py 50.00% <50.00%> (ø)
app/routers/user_exercise.py 72.41% <72.41%> (ø)
app/database/models.py 97.51% <100.00%> (+0.04%) :arrow_up:
app/routers/event.py 95.05% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 5c2136b...ec126c3. Read the comment docs.

codecov-io avatar Feb 07 '21 18:02 codecov-io

Hi

I fix all conflict files

Thanks

Oron

orontamir avatar Feb 10 '21 09:02 orontamir

fix conflict files

Oron

orontamir avatar Feb 10 '21 09:02 orontamir

fix all comments

orontamir avatar Feb 10 '21 12:02 orontamir

fix conflict files

orontamir avatar Feb 10 '21 17:02 orontamir

Fix conflict files

orontamir avatar Feb 11 '21 10:02 orontamir

Fix conflict files

orontamir avatar Feb 11 '21 11:02 orontamir

Hi

I fix all conflict files

orontamir avatar Feb 13 '21 19:02 orontamir

Hi Yam I still wating to response from Microsoft support , Meanwhile, I write the contact by my self and I remove all pictures, Because of copyright, I convert exercise files from png to html file. I create new path for html files and I change the config file , so you can approve my pull request.

If Microsoft support, will return my and alowed my to use their images and screen shot , I just chage the path in the config file.

Hopefully now you can approve my pull request

Thanks

Oron

orontamir avatar Feb 14 '21 12:02 orontamir

Hi Yam I still wating to response from Microsoft support , Meanwhile, I write the contact by my self and I remove all pictures, Because of copyright, I convert exercise files from png to html file. I create new path for html files and I change the config file , so you can approve my pull request.

If Microsoft support, will return my and alowed my to use their images and screen shot , I just chage the path in the config file.

Hopefully now you can approve my pull request

Thanks

Oron

orontamir avatar Feb 14 '21 20:02 orontamir

The images are still there.

yammesicka avatar Feb 15 '21 00:02 yammesicka

Hi Yam

I remove all exercise images from the project

Thanks

Oron

orontamir avatar Feb 15 '21 05:02 orontamir

fix all conflict files

orontamir avatar Feb 15 '21 18:02 orontamir

The HTM files belong to Microsoft.

yammesicka avatar Feb 15 '21 21:02 yammesicka

No. I wrote them ,

orontamir avatar Feb 15 '21 21:02 orontamir

The HTM files belong to Microsoft.

No, I wrote the HTM file , I wrote in word and save as htm file.

orontamir avatar Feb 15 '21 21:02 orontamir

The HTM files belong to Microsoft.

No, I wrote the HTM file , I wrote in word and save as htm file.

The content of the HTML was taken from the app, or from other sources. You must not copyright content of others without their explicit approval, it's called plagiarism and it's usually illegal.

Please use Open Source documents which published under permissive licenses such as CC-BY, MIT, Apache 2 etc, or get the explicit approval of the original content creator.

yammesicka avatar Feb 15 '21 22:02 yammesicka

Please use Open Source documents which published under permissive licenses such as CC-BY, MIT, Apache 2 etc, or get the explicit approval of the original content creator.

Ok , got checking another solution

Thanks

Oron

orontamir avatar Feb 15 '21 22:02 orontamir

Please use Open Source documents which published under permissive licenses such as CC-BY, MIT, Apache 2 etc, or get the explicit approval of the original content creator.

Ok , got checking another solution

Thanks

Oron אישור_ permission

Hi Yam

I gon a permission from microsoft support

Is it Ok for you?

Thanks

Oron

orontamir avatar Feb 16 '21 16:02 orontamir

Hi Yam

I gon a permission from microsoft support

Is it Ok for you?

Thanks

Oron permission

orontamir avatar Feb 16 '21 16:02 orontamir

No man. You can't contact Microsoft Support and ask them question regarding copyright, and obviously not about copyright of applications that belongs to 3rd party.

I've done the work for you and read the ToS of Microsoft Store. It says under subsection 33a:

a. Notices and procedure for making claims of intellectual property infringement.

Microsoft respects the intellectual property rights of third parties. If you wish to send a notice of intellectual property infringement, including claims of copyright infringement, please use our procedures for submitting Notices of Infringement (https://www.microsoft.com/info/cpyrtInfrg.aspx). ALL INQUIRIES NOT RELEVANT TO THIS PROCEDURE WILL NOT RECEIVE A RESPONSE.

Microsoft uses the processes set out in Title 17, United States Code, Section 512 to respond to notices of copyright infringement. In appropriate circumstances, Microsoft may also disable or terminate accounts of users of Microsoft services who may be repeat infringers.

Also, on Microsoft copyright portal they are not permitting to work with their content.

Note that in this page they explicitly write:

Do not alter the screenshot except to resize it. Do not use portions of screenshots. Do not include screenshots in your product user interface. Do not use screenshots that contain third-party content. Do not use screenshots that contain an image of an identifiable individual.

Please also note that the content creators are not Microsoft, but another person named SnegX. I don't know how to content him.

yammesicka avatar Feb 16 '21 19:02 yammesicka

OK

First thanks a lot for your help 👍

I think the best and right solution would be to just ask a gym instructor about a 30 day workout program. This will be my original exercise program 💯

What do you think ?

orontamir avatar Feb 16 '21 20:02 orontamir

That's an option, but why not go for an easier one? :)

Just Google workout plan open source and find something that provided as-is with a free license.

yammesicka avatar Feb 16 '21 23:02 yammesicka

Hi Yam

I found an application with a free license.

https://veevapps.wordpress.com/2017/04/20/lose-weight-in-30-days-privacy-policy/

Hopefully now I can finish my task :) 👍

orontamir avatar Feb 17 '21 18:02 orontamir

Hi Yam

I corresponded with the writer , Vera Mo, [email protected], and he gave me permission to create screenshot from his application.

VeraMo

Hopefully now you can approve my pull request.

Thanks

Oron

orontamir avatar Feb 17 '21 20:02 orontamir

Please let them know you are going to integrate it into another application. This is an important disclaimer which can affect the licensing.

Here is the letter you should send:

Dear Veev Apps,

For the past month I have been working on an open source calendar project. I wanted to know if I could use content from your app (pictures and text of the exercises) and incorporate it into the calendar, in a way that everyone could use. The project is published under the Apache2 license. Here is a link to the project: https://github.com/PythonFreeCourse/calendar

Best Regards, Oron

yammesicka avatar Feb 18 '21 10:02 yammesicka

Hi I send them an email , waiting for them response

Thanks

Oron

orontamir avatar Feb 18 '21 11:02 orontamir

Hi Yam

Veev answer me . I cannot use pictures and text of exercises.

I move to the next solution . write exercises by my self.

Thanks

Oron

orontamir avatar Feb 18 '21 18:02 orontamir

Hi Yam

Since I did not find any open source with exercises , I wrote 30 exercise by my self with som help from gym instructor.

I wrote it in word and convert to HTM files.

Insted of "How to do..." I just add link to YouTube (I do not need license to publish).

Please let me know if its OK with you.

Thanks

Oron

orontamir avatar Feb 19 '21 00:02 orontamir

That's OK Oron. I appreciate your devotion to the goal.

From my side, you have finished the work on this ticket - it is considered a ticket for the certificate. If you want to complete it for yourself - feel free to continue.

yammesicka avatar Feb 19 '21 11:02 yammesicka