Manage positions page #611#627
Conversation
…S and revision date in the table. Also added some CSS to center the text in the table cells. Removed the status field from the demo_data.py file as it is not needed.
…SoftwareDevTeam/lsf into manage_positions_ADN Merged
|
|
||
| positions = Tracy().getPositionsFromDepartment(org, account) | ||
| print(positions) | ||
| print("THIS IS Dept:", dept) |
There was a problem hiding this comment.
Only leave in print statements when absolutely necessary. This one is not necessary.
| @@ -0,0 +1,9 @@ | |||
| $(document).ready(function () { | |||
There was a problem hiding this comment.
Can't bootstrap handle tables? If possible, that's the better way.
| @@ -3,7 +3,12 @@ | |||
| {% block scripts %} | |||
There was a problem hiding this comment.
This whole file has old versions of stuff. Don't include.
|
|
||
| {% endblock %}\ | ||
|
|
||
|
|
There was a problem hiding this comment.
The branch currently has a merge conflicts and needs to be merged into the department-portal-base and then the conflicts resolved
| details = { | ||
| "user": "ute_limited", | ||
| "password": "REPLACE", | ||
| "password": "VB6PlU$WcbDBqZ3m0IDX", |
There was a problem hiding this comment.
Do not commit or push passwords to GitHub
| {% block scripts %} | ||
| {{super()}} | ||
| <script type="text/javascript" src="{{url_for('static', filename='js/departmentPortal.js') }}?u={{lastStaticUpdate}}"></script> | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
departmentPortal.html still has unresolved merge conflict markers (<<<<<<< HEAD, =======, >>>>>>>). This will break the template, so those need to be resolved before merge.
| href="{{url_for('static', filename ='css/departmentPortal.css')}}?u={{lastStaticUpdate}}"> | ||
| ======= | ||
| <link rel="stylesheet" type="text/css" href="/static/css/departmentPortal.css?u={{lastStaticUpdate}}"/> | ||
| >>>>>>> 60ada1ecec53be4b8241ba3c3213984376bc73b6 |
There was a problem hiding this comment.
even this need to be removed
|
|
||
| <div class="card-footer text-center"> | ||
| <a href="#" class="btn btn-primary">View Members | ||
| >>>>>>> 60ada1ecec53be4b8241ba3c3213984376bc73b6 |
| </div> | ||
| </section> | ||
|
|
||
| <<<<<<< HEAD |
| {% endif %} | ||
|
|
||
|
|
||
| <!-- <div class="col-sm-4"> |
There was a problem hiding this comment.
You can delete this part.
|
Once the conflict markers and credential issue are fixed, I can review the page logic again. |
|
|
||
| }, | ||
| { | ||
| "positionTitle": "Teaching Associate", |
| from app.models.allocation import Allocation | ||
| from app.models.positionHistory import PositionHistory | ||
| from app.models.positionHistory import PositionHistory | ||
| # from app.models.ActivePosition import ActivePosition |
6 participants
Fixes issue #644
Changes
Testing