Changeset 6818
- Timestamp:
- Feb 14, 2018, 6:10:39 PM (3 years ago)
- Location:
- taskscheduler/trunk/fuentes
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
taskscheduler/trunk/fuentes/client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py
r6811 r6818 90 90 task_data['mon'],task_data['dow'],u""+task_data['cmd'])) 91 91 cron_array.append(cron_task) 92 # for task_serial,task_info in task_data.items(): 93 # cron_task=("%s %s %s %s %s root %s"%(task_info['m'],task_info['h'],task_info['dom'],\ 94 # task_info['mon'],task_info['dow'],task_info['cmd'])) 95 # cron_array.append(cron_task) 92 96 if task_data: 93 97 with open(fname,'w') as data: -
taskscheduler/trunk/fuentes/python3-taskscheduler.install/usr/share/taskscheduler/taskscheduler.py
r6811 r6818 52 52 tasks={} 53 53 self._debug("Retrieving task list remote=%s"%sw_remote) 54 if self.n4dserver: 55 result=self.n4dserver.get_remote_tasks("","SchedulerServer") 56 if type(result)==type({}): 57 tasks=result.copy() 54 58 result=self.n4dclient.get_tasks("","SchedulerServer") 55 59 if type(result)==type({}): 56 tasks =result['data'].copy()60 tasks.update(result['data'].copy()) 57 61 return tasks 58 62 #def get_scheduled_tasks -
taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/rsrc/taskScheduler.ui
r6813 r6818 396 396 </child> 397 397 <child> 398 <object class="GtkBox" id="nav_bo"> 399 <property name="visible">True</property> 400 <property name="can_focus">False</property> 401 <property name="halign">center</property> 402 <property name="hexpand">True</property> 403 <child> 404 <object class="GtkButton" id="btn_all_tasks"> 405 <property name="label" translatable="yes">button</property> 406 <property name="visible">True</property> 407 <property name="can_focus">True</property> 408 <property name="receives_default">True</property> 409 </object> 410 <packing> 411 <property name="expand">False</property> 412 <property name="fill">True</property> 413 <property name="position">0</property> 414 </packing> 415 </child> 416 <child> 417 <object class="GtkButton" id="btn_fixed_tasks"> 418 <property name="label" translatable="yes">button</property> 419 <property name="visible">True</property> 420 <property name="can_focus">True</property> 421 <property name="receives_default">True</property> 422 </object> 423 <packing> 424 <property name="expand">False</property> 425 <property name="fill">True</property> 426 <property name="position">1</property> 427 </packing> 428 </child> 429 <child> 430 <object class="GtkButton" id="btn_repetitive_tasks"> 431 <property name="label" translatable="yes">button</property> 432 <property name="visible">True</property> 433 <property name="can_focus">True</property> 434 <property name="receives_default">True</property> 435 </object> 436 <packing> 437 <property name="expand">False</property> 438 <property name="fill">True</property> 439 <property name="position">2</property> 440 </packing> 441 </child> 442 <child> 443 <object class="GtkButton" id="btn_daily_tasks"> 444 <property name="label" translatable="yes">button</property> 445 <property name="visible">True</property> 446 <property name="can_focus">True</property> 447 <property name="receives_default">True</property> 448 </object> 449 <packing> 450 <property name="expand">False</property> 451 <property name="fill">True</property> 452 <property name="position">3</property> 453 </packing> 454 </child> 455 </object> 456 <packing> 457 <property name="expand">False</property> 458 <property name="fill">True</property> 459 <property name="position">2</property> 460 </packing> 398 <placeholder/> 461 399 </child> 462 400 </object> -
taskscheduler/trunk/fuentes/server-scheduler.install/etc/n4d/conf.d/SchedulerServer
r6314 r6818 8 8 remove_task=adm,admins,teachers 9 9 get_tasks=*,anonymous 10 get_remote_tasks=*,anonymous 10 11 get_available_tasks=*,anonymous -
taskscheduler/trunk/fuentes/server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py
r6811 r6818 35 35 sw_continue=False 36 36 for task in task_serial.keys(): 37 if ['spread _task'] in task.keys():38 if task['spread _task']==True:37 if ['spread'] in task.keys(): 38 if task['spread']==True: 39 39 sw_continue=True 40 40 break … … 46 46 def get_remote_tasks(self): 47 47 remote_tasks={} 48 tasks_data=self._read_wrkfiles(self.tasks_dir)['data'] 49 for task_serial in tasks_data.keys(): 48 tasks_data=self._read_wrkfiles(self.tasks_dir)['data'].copy() 49 50 for task_name,serial_data in tasks_data.items(): 50 51 sw_continue=False 51 for task in task_serial.keys(): 52 if ['spread_task'] in task.keys(): 53 if task['spread_task']==True: 54 remote_tasks.update(task_serial) 55 break 52 for serial,data in serial_data.items(): 53 if 'spread' in data.keys(): 54 if data['spread']==True: 55 if task_name in remote_tasks.keys(): 56 # remote_tasks[task_name].update({'r'+serial:tasks_data[task_name][serial]}) 57 remote_tasks[task_name]['r'+serial]=tasks_data[task_name][serial] 58 else: 59 remote_tasks[task_name]={'r'+serial:tasks_data[task_name][serial]} 56 60 return remote_tasks 57 61 … … 85 89 if os.path.isfile(wrkfile): 86 90 try: 87 tasks=json.loads(open(wrkfile).read()) 88 except : 91 # with open(wrkfile,"rb") as fh: 92 # tasks=json.load(fh) 93 tasks=json.loads(open(wrkfile,"rb").read()) 94 except Exception as e: 89 95 errormsg=(("unable to open %s") % wrkfile) 96 errormsg=(("Reason: %s") %e) 90 97 self._debug(errormsg) 91 98 return(tasks) … … 132 139 task_name=list(tasks.keys())[0] 133 140 task_serial=list(tasks[task_name].keys())[0] 141 task_data=tasks[task_name][task_serial] 142 del tasks[task_name][task_serial] 143 task_serial=task_serial.strip("r") 144 tasks[task_name]={task_serial:task_data} 134 145 self._debug(tasks) 135 146 serialized_task={}
Note: See TracChangeset
for help on using the changeset viewer.