Skip to content

Commit

Permalink
before jj coomit - template
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Sep 22, 2012
1 parent 99c0339 commit f0bc391
Show file tree
Hide file tree
Showing 9 changed files with 1,626 additions and 8 deletions.
118 changes: 118 additions & 0 deletions logs/Adress

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions logs/CommunicationLogs
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,20 @@ None
2012-09-15 12:39:21,812 DBFunctions line:75 DEBUG [DBInsertCommunication] [{'result': 1, 'rescode': 100}]
2012-09-15 14:30:08,690 DBFunctions line:72 DEBUG [DBInsertCommunication] SELECT * FROM MessgaeInsert('eJwLC0ktLuEqMOTSAwASJgLa','eJwL49IDAAFHAI8=',1,1,'2012-09-15 14:30:08.689599',-1,-1,'SYS_PER_INSERT',11,'115.252.35.137');
2012-09-15 14:30:08,701 DBFunctions line:75 DEBUG [DBInsertCommunication] [{'result': 1, 'rescode': 98}]
2012-09-16 12:29:28,298 DBFunctions line:72 DEBUG [DBInsertCommunication] SELECT * FROM MessgaeInsert('eJwLC0ktLuEqMOTSAwASJgLa','eJwLC0ktLlHwyy/JTE7lKjDk0gMANYYFXA==',1,1,'2012-09-16 12:29:28.297644',-1,-1,'SYS_PER_INSERT',24,'115.252.38.20');
2012-09-16 12:29:28,315 DBFunctions line:75 DEBUG [DBInsertCommunication] [{'result': 1, 'rescode': 111}]
2012-09-22 16:51:05,839 CommunicationFunctions line:54 ERROR [getNCommunicationsbyPageIndex] == Exception ==
Traceback (most recent call last):
File "/var/www/vhosts/thoughtxplore.com/uiet/tx2/tx2/Communication/BusinessFunctions/CommunicationFunctions.py", line 39, in getNCommunicationsbyPageIndex
Page=Pages.page(1)
AttributeError: 'NoneType' object has no attribute 'page'
2012-09-22 16:51:30,112 CommunicationFunctions line:54 ERROR [getNCommunicationsbyPageIndex] == Exception ==
Traceback (most recent call last):
File "/var/www/vhosts/thoughtxplore.com/uiet/tx2/tx2/Communication/BusinessFunctions/CommunicationFunctions.py", line 39, in getNCommunicationsbyPageIndex
Page=Pages.page(1)
AttributeError: 'NoneType' object has no attribute 'page'
2012-09-22 16:51:33,543 CommunicationFunctions line:54 ERROR [getNCommunicationsbyPageIndex] == Exception ==
Traceback (most recent call last):
File "/var/www/vhosts/thoughtxplore.com/uiet/tx2/tx2/Communication/BusinessFunctions/CommunicationFunctions.py", line 39, in getNCommunicationsbyPageIndex
Page=Pages.page(1)
AttributeError: 'NoneType' object has no attribute 'page'
398 changes: 398 additions & 0 deletions logs/QueryLogs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions logs/SecurityLogs
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,10 @@
2012-09-15 22:30:30,995 StateFunctions line:40 DEBUG [ListAllStates] 4
2012-09-15 12:00:54,796 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-15 22:31:10,051 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-16 12:23:06,570 StateFunctions line:40 DEBUG [ListAllStates] 4
2012-09-16 12:23:32,094 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-16 12:23:56,597 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-16 12:24:22,876 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-16 12:25:48,954 StateFunctions line:40 DEBUG [ListAllStates] 4
2012-09-16 12:25:59,997 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
2012-09-16 12:26:22,141 PermissionFunctions line:40 DEBUG [ListAllPermissions] 4
697 changes: 697 additions & 0 deletions logs/UserLogs

Large diffs are not rendered by default.

334 changes: 334 additions & 0 deletions logs/UserProfileLogs

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions templates/Communication/Admin/PostNotices.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{% extends "UserProfileMaster.html" %}
<title>{% block title %}{{title}}{% endblock %}</title>

{% block UserProfileMaster_content_center %}

<div class="row">
{% if 'NOTICE' in type %}
<div class="formtitle">Post NOTICE</div>
</div>

<form action="/communication/Admin/Notice/Post" method="post">


{% else %}
<div class="formtitle">Post NEWS</div>
</div>

<form action="/communication/Admin/News/Post" method="post">

{% endif %}



{% csrf_token %}
<div class="row">
<div class="labelclass" >Title</div>
<div class="widgetclass" ><input type="text" name="Title" class="widget" /></div>
</div><br />

{% if 'NEWS' in type %}

<div class="row">
<div class="labelclass" >Date</div>
<div class="widgetclass" ><input type="text" name="date_" class="widget" /></div>
</div>


{% endif %}
<div class="rowbig">
<div class="labelclass" >Notice Content</div>
<div class="widgetclass" ><textarea name="Content" rows="10" spellcheck="true" ></textarea></div>
</div>



<div class="row">
<input type="submit" id="submit" value="SUBMIT" />
</div>
</form>

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,11 @@
<div class="row">
<div class="labelclass" >Date</div>
<div class="widgetclass" ><input type="text" name="date_" class="widget" /></div>
</div><br />
</div>

</div>


{% endif %}
<div class="rowbig">
<div class="labelclass" >Notice Content</div>
<div class="widgetclass" ><textarea name="Content" rows="10" spellcheck="true" ></textarea></div>
</div>



Expand Down
5 changes: 3 additions & 2 deletions tx2/jobs/Views/JobViews.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ def BranchJobEdit(HttpRequest,CompanyID, JobID):
isinitial = 'Initial_' + str(branch.id)
if (isinitial) in HttpRequest.POST:
isinitial = HttpRequest.POST[isinitial]
result = [1,-1]
if isinitial != "-1":
# edit
_id = int(isinitial)
Expand All @@ -346,8 +347,8 @@ def BranchJobEdit(HttpRequest,CompanyID, JobID):
result = BranchJobFunctionsObj.Add(branch.id,JobID,JobTypeID,Comments1,Comments2,int(details['userid']),HttpRequest.META['REMOTE_ADDR'])
print str(result) + '==' + branch.BranchName
if result[0] != 1:
messages.error(HttpRequest,'ERROR : ' + result[1])
return HttpResponseRedirect('/message/')
messages.error(HttpRequest,'ERROR : ' + result[1])
return HttpResponseRedirect('/message/')
return HttpResponseRedirect('/message/')
except Exception, ex:
frame = inspect.currentframe()
Expand Down

0 comments on commit f0bc391

Please sign in to comment.