Reading Schema Update #193
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
|
|
||
| > **You can view the demo [here](https://vinitshahdeo.github.io/Water-Monitoring-System/src/home.html).** | ||
|
|
||
| [](https://github.com/vinitshahdeo/Water-Monitoring-System/) [](https://github.com/vinitshahdeo/Water-Monitoring-System/) | ||
|
|
||
| Water Monitoring System is an IOT based Liquid Level Monitoring system that has mechanisms to keep the user alerted in case of liquid overflow or when tank depletes. The water tanks can be fixed with ultrasonic sensors that is placed over the container. Ultrasonic sensor is used to measure, compare container depth and liquid level. | ||
|
|
||
|
|
@@ -116,6 +116,7 @@ git push -u origin <your_branch_name> | |
|
|
||
| - Refer [this](https://github.com/vinitshahdeo/Water-Monitoring-System/blob/master/CONTRIBUTING.md) for more. | ||
|
|
||
|
|
||
| ## Open Source Programs | ||
|
|
||
| This project is part of the following Open Source programs: | ||
|
|
@@ -140,18 +141,51 @@ _Yes, it is a hardware/IoT + software project. There would be maximum tasks rela | |
|
|
||
| #### _3. How to communicate with us?_ | ||
|
|
||
| _All communication will happen on the Slack channel for this particular projects. Mentors can also be reached through GitHub. Avoid DMs and unnecessary mentions on slack and GitHub both. Checkout [this](https://github.com/vinitshahdeo/Water-Monitoring-System/issues/15) issue for more._ | ||
|
|
||
| #### _4. What is the Tech Stack for this project?_ | ||
|
|
||
| - **Frontend:** React | ||
|
|
||
| - **Backend:** Django, Node.js | ||
|
|
||
| #### _5. What is the deadline for any task submission?_ | ||
|
|
||
| _Mentors can assign issues to participants and also mention a deadline before which the issue is to be resolved. They can reassign issues in case of any delay, so be active and complete your tasks within the negotiated duration._ | ||
|
|
||
| ## About [RGSoC'20](https://railsgirlssummerofcode.org/) | ||
|
|
||
|
|
||
| <a href="https://github.com/vinitshahdeo/Water-Monitoring-System/issues/141" target="_blank"><img src="./assets/rgsoc2020.png" width="30%" height="30%"/></a> | ||
|
|
||
| ```javascript | ||
|
|
||
| var baseURL = `https://github.com`, | ||
| projectsInRGSoC = _.filter(appliedProjects, | ||
| (project) => { | ||
| RGSoC.isSelected(project, | ||
| new Date().getFullYear()) | ||
| }); | ||
|
|
||
| if (_.contains(projectsInRGSoC, { | ||
| name: `Water Monitoring System`, | ||
| url: `${baseURL}Water-Monitoring-System` | ||
| })) { | ||
| fork('Water Monitoring System'); | ||
| // Looking forward to awesome contributions | ||
| console.log('Thank You RGSoC'); | ||
| } | ||
|
|
||
| ``` | ||
|
|
||
| **Glad to share that this project is shortlisted for [Rails Girls Summer Of Code 2020](https://railsgirlssummerofcode.org/)**, a global fellowship program for women and non-binary coders. Students receive a three-month scholarship to work on existing Open Source projects and expand their skill set. | ||
|
|
||
| - [Click here](https://railsgirlssummerofcode.org/blog/) to learn more. | ||
| - **RGSoC student applications have officially started on Monday, 02 March 2020. Apply [here](https://teams.railsgirlssummerofcode.org/apply).** | ||
| - Check out the project [here](https://teams.railsgirlssummerofcode.org/projects/293-water-monitoring-system). | ||
| - **[Click here](https://twitter.com/Vinit_Shahdeo/status/1234936360613695489) to view the tweet**. RTs are most welcome! :heart: | ||
| - Feel free to **shoot your doubts [here](https://github.com/vinitshahdeo/Water-Monitoring-System/issues/141)**. | ||
|
|
||
| ## Additional Info | ||
|
|
||
| - If you're interested in contributing for **documentation**, please checkout `feature/documentation` branch. | ||
|
|
@@ -179,8 +213,9 @@ _Mentors can assign issues to participants and also mention a deadline before wh | |
| | [@ArpitKotecha](https://github.com/ArpitKotecha) | Backend | | ||
| | [@Manvityagi](https://github.com/Manvityagi) | APIs + Cloud | | ||
| | [@jainpawan21](https://github.com/jainpawan21) | Frontend | | ||
| | [@amaaniqbal](https://github.com/amaaniqbal) | Frontend | | ||
|
|
||
| [](https://fayz.in/stories/s/1522/0/?ckt_id=ZGL1ZGVk)[](https://github.com/vinitshahdeo)[](https://github.com/vinitshahdeo)[](https://www.linkedin.com/in/vinitshahdeo/)[](https://www.linkedin.com/in/vinitshahdeo/)[](https://www.linkedin.com/in/vinitshahdeo/)[](https://fayz.in/stories/s/1522/0/?ckt_id=ZGL1ZGVk)[](https://twitter.com/Vinit_Shahdeo) | ||
|
|
||
| ## Useful Resources | ||
|
|
||
|
|
@@ -198,7 +233,7 @@ _Mentors can assign issues to participants and also mention a deadline before wh | |
| | **[Vinit Shahdeo](https://www.linkedin.com/in/vinitshahdeo/)** | | ||
| | <a href="https://twitter.com/Vinit_Shahdeo"><img src="assets/twitter.png" width="32px" height="32px"></a> <a href="https://www.facebook.com/vinit.shahdeo"><img src="assets/facebook.png" width="32px" height="32px"></a> <a href="https://www.linkedin.com/in/vinitshahdeo/"><img src="assets/linkedin.png" width="32px" height="32px"></a> | | ||
|
|
||
| > **_Need help?_** | ||
| > **_Feel free to contact me @ [[email protected]](mailto:[email protected]?Subject=WaterMonitoringProject)_** | ||
|
|
||
| [](https://github.com/vinitshahdeo/) [](https://twitter.com/Vinit_Shahdeo) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,23 @@ const readingSchema = new mongoose.Schema({ | |
| value: { | ||
| required: true, | ||
| type: String | ||
| }, | ||
| tankId: { | ||
| required: true, | ||
| type: mongoose.Types.ObjectId | ||
| }, | ||
| tankCapacity: { | ||
| required: true, | ||
| type: Number | ||
| }, | ||
| tankLocation: { | ||
| required: true, | ||
| type: String | ||
|
There was a problem hiding this comment. @ArpitKotecha. I have made the necessary changes. Please review. |
||
| }, | ||
| tankName: { | ||
| required: true, | ||
| type: String | ||
| } | ||
| }); | ||
|
|
||
| module.exports = mongoose.model("reading", readingSchema); | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,79 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="author" content="Vinit Shahdeo" /> | ||
| <link | ||
| href="http://www.jqueryscript.net/css/jquerysctipttop.css" | ||
| rel="stylesheet" | ||
| type="text/css" | ||
| /> | ||
| <title>Water Monitoring System</title> | ||
| <style> | ||
| body { | ||
| background-color: #fafafa; | ||
| font-family: "Roboto"; | ||
| } | ||
|
|
||
| .container { | ||
| margin: 150px auto; | ||
| max-width: 960px; | ||
| } | ||
| </style> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="container"> | ||
| <h1>Water Tanks</h1> | ||
| <div class="loading" style="width: 140px;height: 140px;float:left"></div> | ||
| <div class="loading" style="width: 160px;height: 160px;float:left"></div> | ||
| <div | ||
| class="waterBall1" | ||
| style="width: 200px;height:200px; float:left" | ||
| ></div> | ||
| <div class="demo" style="width: 200px;height:200px; float:left"></div> | ||
| </div> | ||
| <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> | ||
| <script type="text/javascript" src="lib/createWaterBall-jquery.js"></script> | ||
| <script> | ||
| $(".demo").createWaterBall({ | ||
| targetRange: 90 | ||
| }); | ||
|
|
||
| var loadingEle = $(".loading"); | ||
| var loading_width = loadingEle.width(), | ||
| loading_height = loadingEle.height(); | ||
| $(".loading").createWaterBall({ | ||
| cvs_config: { | ||
| width: loading_width, | ||
| height: loading_height | ||
| }, | ||
| wave_config: { | ||
| waveWidth: 0.02, | ||
| waveHeight: 5 | ||
| }, | ||
| data_range: [30, 70, 100], | ||
| isLoading: true, | ||
| nowRange: 70, | ||
| targetRange: 70 | ||
| }); | ||
| setTimeout(function() { | ||
| $(".loading").createWaterBall("updateRange", 80); | ||
| }, 1000); | ||
| $(".waterBall1").createWaterBall({ | ||
| csv_config: { | ||
| width: $(".waterBall1").width(), | ||
| height: $(".waterBall1").height() | ||
| }, | ||
| wave_config: { | ||
| waveWidth: 0.02, | ||
| waveHeight: 5 | ||
| }, | ||
| data_range: [40, 50, 100], | ||
| targetRange: 45 | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ArpitKotecha Can you please review this. I see similar PR at other places too? Can you please verify.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinitshahdeo Probably while creating/modifying routes in other PR's they have modified the schema accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinitshahdeo Maybe we can merge this and request in other PR to include this schema instead of modifying by themselve.